diff options
Diffstat (limited to 'smoke')
-rw-r--r-- | smoke/README | 12 | ||||
-rw-r--r-- | smoke/configure.in.in | 4 | ||||
-rw-r--r-- | smoke/tde/configure.in.in | 2 | ||||
-rwxr-xr-x | smoke/tde/generate_makefile_am.pl | 6 | ||||
-rw-r--r-- | smoke/tqt/Makefile.am (renamed from smoke/qt/Makefile.am) | 12 | ||||
-rw-r--r-- | smoke/tqt/configure.in.in (renamed from smoke/qt/configure.in.in) | 10 | ||||
-rw-r--r-- | smoke/tqt/generate.pl.in (renamed from smoke/qt/generate.pl.in) | 6 | ||||
-rwxr-xr-x | smoke/tqt/generate_makefile_am.pl (renamed from smoke/qt/generate_makefile_am.pl) | 6 | ||||
-rw-r--r-- | smoke/tqt/header_list (renamed from smoke/qt/header_list) | 0 | ||||
-rw-r--r-- | smoke/tqt/hint_header_list.pl (renamed from smoke/qt/hint_header_list.pl) | 0 | ||||
-rw-r--r-- | smoke/tqt/qscintilla_header_list (renamed from smoke/qt/qscintilla_header_list) | 0 | ||||
-rw-r--r-- | smoke/tqt/qt_smoke.h (renamed from smoke/qt/qt_smoke.h) | 0 | ||||
-rw-r--r-- | smoke/tqt/qtguess.pl.in (renamed from smoke/qt/qtguess.pl.in) | 0 | ||||
-rw-r--r-- | smoke/tqt/smokeqt.pro (renamed from smoke/qt/smokeqt.pro) | 0 |
14 files changed, 29 insertions, 29 deletions
diff --git a/smoke/README b/smoke/README index 0964a7a6..f521a02b 100644 --- a/smoke/README +++ b/smoke/README @@ -1,20 +1,20 @@ SMOKE stands for "Scripting Meta Object Kompiler Engine" - for instance ;) -This directory compiles a smokeqt (and later a smoketde) library, which -contain interfaces to (almost) all Qt and KDE classes. -The next PerlQt/PerlKDE will be based on SMOKE. +This directory compiles a smoketqt (and later a smoketde) library, which +contain interfaces to (almost) all TQt and TDE classes. +The next PerlTQt/PerlTDE will be based on SMOKE. However SMOKE is language-independent enough for other bindings (e.g. to other scripting languages) to be based on it. Note that the .cpp source files are auto-generated by kalyptus, from reading -the Qt/KDE headers. +the TQt/TDE headers. Regenerating ============ -For SmokeQt: - cd qt +For SmokeTQt: + cd tqt ./qtguess.pl ./generate.pl make diff --git a/smoke/configure.in.in b/smoke/configure.in.in index 2dbf9253..7e27cc95 100644 --- a/smoke/configure.in.in +++ b/smoke/configure.in.in @@ -1,8 +1,8 @@ AC_ARG_WITH( smoke, - [ --with-smoke@<:@=qt|kde@:>@ Smoke: build Smoke for qt+tde or qt only @<:@default:qt tde@:>@], + [ --with-smoke@<:@=tqt|tde@:>@ Smoke: build Smoke for tqt+tde or tqt only @<:@default:tqt tde@:>@], [ kde_build_libsmoke="$withval" ], - [ kde_build_libsmoke="qt tde" ] + [ kde_build_libsmoke="tqt tde" ] ) AC_SUBST(kde_build_libsmoke) diff --git a/smoke/tde/configure.in.in b/smoke/tde/configure.in.in index 7cca7173..1999a9ee 100644 --- a/smoke/tde/configure.in.in +++ b/smoke/tde/configure.in.in @@ -10,7 +10,7 @@ AC_SUBST(KDE_HAVE_GL) KDE_PREFIX=`$KDECONFIG --prefix --expandvars` AC_SUBST(KDE_PREFIX) -if test "X$kde_build_libsmoke" = "Xtde" -o "X$kde_build_libsmoke" = "Xqt tde"; then +if test "X$kde_build_libsmoke" = "Xtde" -o "X$kde_build_libsmoke" = "Xtqt tde"; then AC_CONFIG_FILES([ smoke/tde/qtguess.pl ], [ cd smoke/tde diff --git a/smoke/tde/generate_makefile_am.pl b/smoke/tde/generate_makefile_am.pl index 03f51747..61995278 100755 --- a/smoke/tde/generate_makefile_am.pl +++ b/smoke/tde/generate_makefile_am.pl @@ -12,16 +12,16 @@ open( MAKEFILE, "<$outdir/Makefile.am" ) or die; my $makeFileData = ''; my $found = 0; while (<MAKEFILE>) { - if (/^libsmokeqt_la_SOURCES/) + if (/^libsmoketqt_la_SOURCES/) { $found = 1; - $makeFileData .= "libsmokeqt_la_SOURCES = smokedata.cpp"; + $makeFileData .= "libsmoketqt_la_SOURCES = smokedata.cpp"; } $makeFileData .= $_ if (!$found); } close MAKEFILE; -die "libsmokeqt_la_SOURCES not found" if (!$found); +die "libsmoketqt_la_SOURCES not found" if (!$found); open( MAKEFILE, ">$tempfile" ) or die; print MAKEFILE $makeFileData; diff --git a/smoke/qt/Makefile.am b/smoke/tqt/Makefile.am index 9be641f0..5c506ae6 100644 --- a/smoke/qt/Makefile.am +++ b/smoke/tqt/Makefile.am @@ -1,24 +1,24 @@ -lib_LTLIBRARIES = libsmokeqt.la +lib_LTLIBRARIES = libsmoketqt.la -# set the include path for X, qt and KDE +# set the include path for X, tqt and TDE INCLUDES = -I$(srcdir)/.. $(all_includes) EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am # the library search path. -libsmokeqt_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) +libsmoketqt_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) # the libraries to link against. -libsmokeqt_la_LIBADD = $(LIB_QT) $(GLLIB) $(LIBTQSCINTILLA) +libsmoketqt_la_LIBADD = $(LIB_QT) $(GLLIB) $(LIBTQSCINTILLA) x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \ x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp # which sources should be compiled for perlqtkde -libsmokeqt_la_SOURCES = $(x_sources) smokedata.cpp +libsmoketqt_la_SOURCES = $(x_sources) smokedata.cpp $(x_sources) smokedata.cpp: perl generate.pl -CLEANFILES = $(libsmokeqt_la_SOURCES) +CLEANFILES = $(libsmoketqt_la_SOURCES) diff --git a/smoke/qt/configure.in.in b/smoke/tqt/configure.in.in index 3ea9d09e..8d263fbd 100644 --- a/smoke/qt/configure.in.in +++ b/smoke/tqt/configure.in.in @@ -9,20 +9,20 @@ AC_SUBST(KDE_HAVE_GL) AC_ARG_WITH( threshold, - [ --with-threshold@<:@=0..15@:>@ Smoke: Qt tests threshold Default:15 Lower=more tests], + [ --with-threshold@<:@=0..15@:>@ Smoke: TQt tests threshold Default:15 Lower=more tests], [ qt_test_threshold="$withval" ], [ qt_test_threshold=15 ] ) AC_SUBST(qt_test_threshold) -if test "X$kde_build_libsmoke" = "Xqt" -o "X$kde_build_libsmoke" = "Xqt tde"; then +if test "X$kde_build_libsmoke" = "Xtqt" -o "X$kde_build_libsmoke" = "Xtqt tde"; then - AC_CONFIG_FILES([ smoke/qt/qtguess.pl ], [ - cd smoke/qt + AC_CONFIG_FILES([ smoke/tqt/qtguess.pl ], [ + cd smoke/tqt perl qtguess.pl cd ../.. ]) - AC_CONFIG_FILES([ smoke/qt/generate.pl ], [ + AC_CONFIG_FILES([ smoke/tqt/generate.pl ], [ ]) fi diff --git a/smoke/qt/generate.pl.in b/smoke/tqt/generate.pl.in index fe6abf1b..8c156a37 100644 --- a/smoke/qt/generate.pl.in +++ b/smoke/tqt/generate.pl.in @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -## Run this first, to generate the x_*.cpp files from the Qt headers +## Run this first, to generate the x_*.cpp files from the TQt headers ## using kalyptus my $kalyptusdir = "../../kalyptus"; @@ -108,7 +108,7 @@ if("@KDE_HAVE_GL@" eq "yes") } else { - print STDERR "Qt was not compiled with OpenGL support...\n Skipping TQGL Classes.\n"; + print STDERR "TQt was not compiled with OpenGL support...\n Skipping TQGL Classes.\n"; } } @@ -132,7 +132,7 @@ foreach $filename (readdir(QT)) { closedir QT; # Launch kalyptus -chdir "../smoke/qt"; +chdir "../smoke/tqt"; system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers"; my $exit = $? >> 8; exit $exit if ($exit); diff --git a/smoke/qt/generate_makefile_am.pl b/smoke/tqt/generate_makefile_am.pl index 03f51747..61995278 100755 --- a/smoke/qt/generate_makefile_am.pl +++ b/smoke/tqt/generate_makefile_am.pl @@ -12,16 +12,16 @@ open( MAKEFILE, "<$outdir/Makefile.am" ) or die; my $makeFileData = ''; my $found = 0; while (<MAKEFILE>) { - if (/^libsmokeqt_la_SOURCES/) + if (/^libsmoketqt_la_SOURCES/) { $found = 1; - $makeFileData .= "libsmokeqt_la_SOURCES = smokedata.cpp"; + $makeFileData .= "libsmoketqt_la_SOURCES = smokedata.cpp"; } $makeFileData .= $_ if (!$found); } close MAKEFILE; -die "libsmokeqt_la_SOURCES not found" if (!$found); +die "libsmoketqt_la_SOURCES not found" if (!$found); open( MAKEFILE, ">$tempfile" ) or die; print MAKEFILE $makeFileData; diff --git a/smoke/qt/header_list b/smoke/tqt/header_list index ffa24c70..ffa24c70 100644 --- a/smoke/qt/header_list +++ b/smoke/tqt/header_list diff --git a/smoke/qt/hint_header_list.pl b/smoke/tqt/hint_header_list.pl index ff9c86b7..ff9c86b7 100644 --- a/smoke/qt/hint_header_list.pl +++ b/smoke/tqt/hint_header_list.pl diff --git a/smoke/qt/qscintilla_header_list b/smoke/tqt/qscintilla_header_list index 0da11cb6..0da11cb6 100644 --- a/smoke/qt/qscintilla_header_list +++ b/smoke/tqt/qscintilla_header_list diff --git a/smoke/qt/qt_smoke.h b/smoke/tqt/qt_smoke.h index 8859c243..8859c243 100644 --- a/smoke/qt/qt_smoke.h +++ b/smoke/tqt/qt_smoke.h diff --git a/smoke/qt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in index 89b8aa39..89b8aa39 100644 --- a/smoke/qt/qtguess.pl.in +++ b/smoke/tqt/qtguess.pl.in diff --git a/smoke/qt/smokeqt.pro b/smoke/tqt/smokeqt.pro index f49fc61b..f49fc61b 100644 --- a/smoke/qt/smokeqt.pro +++ b/smoke/tqt/smokeqt.pro |