Browse Source

Rename smokeqt -> smoketqt

bug/266/move-to-usr
Slávek Banko 9 years ago
parent
commit
3d89f5e5c4
  1. 2
      korundum/rubylib/korundum/Korundum.cpp
  2. 2
      qtruby/INSTALL
  3. 4
      qtruby/bin/Makefile.am
  4. 2
      qtruby/rubylib/designer/uilib/extconf.rb
  5. 2
      qtruby/rubylib/qtruby/Makefile.am
  6. 2
      qtruby/rubylib/qtruby/extconf.rb
  7. 12
      smoke/README
  8. 4
      smoke/configure.in.in
  9. 2
      smoke/tde/configure.in.in
  10. 6
      smoke/tde/generate_makefile_am.pl
  11. 12
      smoke/tqt/Makefile.am
  12. 10
      smoke/tqt/configure.in.in
  13. 6
      smoke/tqt/generate.pl.in
  14. 6
      smoke/tqt/generate_makefile_am.pl
  15. 0
      smoke/tqt/header_list
  16. 0
      smoke/tqt/hint_header_list.pl
  17. 0
      smoke/tqt/qscintilla_header_list
  18. 0
      smoke/tqt/qt_smoke.h
  19. 0
      smoke/tqt/qtguess.pl.in
  20. 0
      smoke/tqt/smokeqt.pro

2
korundum/rubylib/korundum/Korundum.cpp

@ -1160,7 +1160,7 @@ Init_korundum()
#endif
set_kde_resolve_classname(kde_resolve_classname);
// The Qt extension is linked against libsmokeqt.so, but Korundum links against
// The Qt extension is linked against libsmoketqt.so, but Korundum links against
// libsmoketde.so only. Specifying both a 'require Qt' and a 'require Korundum',
// would give a link error (see the rb_fatal() error above).
// So call the Init_qtruby() initialization function explicitely, not via 'require Qt'

2
qtruby/INSTALL

@ -47,7 +47,7 @@ Build Qt/Mac and install in /Developer/qt. These configure flags work well:
Configure QtRuby and build the Smoke library:
$ ./configure '--with-qt-dir=/Developer/qt' '--enable-mac'
$ cd smoke/qt
$ cd smoke/tqt
# Generate the Smoke library sources:
$ perl generate.pl
# Overwrite the automake generated Makefile:

4
qtruby/bin/Makefile.am

@ -1,9 +1,9 @@
INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
bin_PROGRAMS = qtrubyinit
qtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/qt/ -L$(RUBY_LIBDIR)
qtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tqt/ -L$(RUBY_LIBDIR)
qtrubyinit_METASOURCES = AUTO
qtrubyinit_SOURCES = qtrubyinit.cpp
qtrubyinit_LDADD = $(LIB_QT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/qt/libsmokeqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
qtrubyinit_LDADD = $(LIB_QT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
bin_SCRIPTS = rbqtapi rbqtsh

2
qtruby/rubylib/designer/uilib/extconf.rb

@ -2,5 +2,5 @@ require 'mkmf'
dir_config('smoke')
dir_config('qt')
$CPPFLAGS += " -I../../../../smoke -I../../qtruby "
$LOCAL_LIBS += '-bundle_loader ../../qtruby/qtruby.bundle -lsmokeqt -ltqui -ltqt-mt -lstdc++'
$LOCAL_LIBS += '-bundle_loader ../../qtruby/qtruby.bundle -lsmoketqt -ltqui -ltqt-mt -lstdc++'
create_makefile("tqui")

2
qtruby/rubylib/qtruby/Makefile.am

@ -10,6 +10,6 @@ rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = qtruby.la
qtruby_la_SOURCES =
qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT) $(top_builddir)/smoke/qt/libsmokeqt.la
qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT) $(top_builddir)/smoke/tqt/libsmoketqt.la
SUBDIRS = lib

2
qtruby/rubylib/qtruby/extconf.rb

@ -1,5 +1,5 @@
require 'mkmf'
dir_config('smoke')
dir_config('qt')
$LOCAL_LIBS += '-lsmokeqt -ltqt-mt -lstdc++'
$LOCAL_LIBS += '-lsmoketqt -ltqt-mt -lstdc++'
create_makefile("qtruby")

12
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

4
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)

2
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

6
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;

12
smoke/qt/Makefile.am → 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)

10
smoke/qt/configure.in.in → 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

6
smoke/qt/generate.pl.in → 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);

6
smoke/qt/generate_makefile_am.pl → 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;

0
smoke/qt/header_list → smoke/tqt/header_list

0
smoke/qt/hint_header_list.pl → smoke/tqt/hint_header_list.pl

0
smoke/qt/qscintilla_header_list → smoke/tqt/qscintilla_header_list

0
smoke/qt/qt_smoke.h → smoke/tqt/qt_smoke.h

0
smoke/qt/qtguess.pl.in → smoke/tqt/qtguess.pl.in

0
smoke/qt/smokeqt.pro → smoke/tqt/smokeqt.pro

Loading…
Cancel
Save