TDE
/
libtqt-perl
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libtqt-perl
0
0
Fork 0
Code Issues Releases Wiki Activity

Use smoketqt

Browse Source
bug/266/move-to-usr
Timothy Pearson 13 years ago
parent 79dd73b042
commit ae3f951700
9 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File

2
INSTALL
Unescape View File

@ -29,7 +29,7 @@ Custom important options :
--with-threshold=<0..15> : set the lever of standardness of your TQt
library. Default is 10, which is reasonable.
If your TQt library is very customized, and you
experience missing symbols in libsmokeqt.so,
experience missing symbols in libsmoketqt.so,
set this to zero (paranoid level).
====

2
Makefile.PL
Unescape View File

@ -100,7 +100,7 @@ unless ($ENV{'KDEDIR'} or grep /--prefix/, @ARGV)
"did not use the '--prefix=' commandline option.\n";
print "KDE-3 isn't required at all. However, if it's installed on your system,\n".
"it is much better to specify it's location since PerlTQt uses (or build, if\n".
"it can't find it) a KDE library named smokeqt.\n";
"it can't find it) a KDE library named smoketqt.\n";
print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n";
sleep(5);
}

8
PerlTQt/INSTALL
Unescape View File

@ -21,7 +21,7 @@ Make sure your $TQTDIR environment-variable is set.
I'm sorry for all the requirements, but you *are* getting this from
CVS. Release versions will be much easier and more independant.
First, you need to download the development environment for smokeqt.
First, you need to download the development environment for smoketqt.
Please use compression for cvs downloads ('cvs -z4' in .cvsrc).
$ export CVSROOT=:pserver:anonymous@anoncvs.kde.org:/home/kde
@ -32,7 +32,7 @@ $ cvs co kdebindings/smoke # pre-generated smoke library
$ cd kdebindings # kdebindings/
$ cvs co admin # get kde build tools
At this point, you now have the full smokeqt environment. The
At this point, you now have the full smoketqt environment. The
pre-generated smoke library is based off KDE's copy of TQt-3.0.4. I have
TQt-3.0.1, so I have to re-generate the files to match my installed
version of TQt. Here's how to do it.
@ -51,7 +51,7 @@ $ cd smoke # kdebindings/smoke/
$ make # this should succeed
$ make install # will install to --prefix from configure
Okay, you now have libsmokeqt installed on your system. You can now
Okay, you now have libsmoketqt installed on your system. You can now
compile PerlTQt. First, get the latest version of PerlTQt-3.
$ export CVSROOT=:pserver:anonymous@cvs.perlqt.sf.net:/cvsroot/perlqt
@ -59,7 +59,7 @@ $ cvs login # no password
$ cvs co PerlTQt-3
$ cd PerlTQt-3 # PerlTQt-3/
If you installed libsmokeqt in a non-standard library path, you will
If you installed libsmoketqt in a non-standard library path, you will
need to edit Makefile.PL and add -L/your/lib/path to the LIBS
parameter. If any of the other options in Makefile.PL need changing for
your system, you will need to change it now.

4
PerlTQt/Makefile.PL.in
Unescape View File

@ -85,7 +85,7 @@ WriteMakefile(
'VERSION_FROM' => 'TQt.pm', # finds $VERSION
'PREREQ_PM' => {}, # e.g., Module::Name => 1.1,
'INC' => '@all_includes@ -I. -I../smoke',
'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmokeqt ".'@LIBCRYPT@'." $qtlib"],
'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@LIBCRYPT@'." $qtlib"],
# 'XS' => {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c
'XSOPT' => "-C++",
'OBJECT' => "$objects", # Object files
@ -116,7 +116,7 @@ sub MY::const_loadlibs {
package MY;
my $i = shift->SUPER::const_loadlibs(@_);
# hacks for linking against a non-yet-installed smoke
$i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmokeqt\n/gs unless $i =~/-lsmokeqt/;
$i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmoketqt\n/gs unless $i =~/-lsmoketqt/;
$i =~ s#(LD_RUN_PATH.*?)(${localsmoke})?\n#"$1".($2?"":":")."$x{'libdir'}\n"#se;
$i;
}

6
PerlTQt/TQt.xs
Unescape View File

@ -442,7 +442,7 @@ public:
static_TQUType_int.set(po, si->s_int);
break;
case xmoc_double:
static_TQUType_double.set(po, si->s_double);
static_QUType_double.set(po, si->s_double);
break;
case xmoc_charstar:
static_TQUType_charstar.set(po, (char*)si->s_voidp);
@ -567,7 +567,7 @@ public:
_stack[i].s_int = static_TQUType_int.get(o);
break;
case xmoc_double:
_stack[i].s_double = static_TQUType_double.get(o);
_stack[i].s_double = static_QUType_double.get(o);
break;
case xmoc_charstar:
_stack[i].s_voidp = static_TQUType_charstar.get(o);
@ -1638,7 +1638,7 @@ make_TQUParameter(name, type, extra, inout)
else if(!strcmp(type, "int"))
p->type = &static_TQUType_int;
else if(!strcmp(type, "double"))
p->type = &static_TQUType_double;
p->type = &static_QUType_double;
else if(!strcmp(type, "char*") || !strcmp(type, "const char*"))
p->type = &static_TQUType_charstar;
else if(!strcmp(type, "TQString") || !strcmp(type, "TQString&") ||

12
configure.in
Unescape View File

@ -234,7 +234,7 @@ dnl-------------------------------
AC_DEFUN(KDE_CHECK_SMOKE,
[
AC_MSG_CHECKING(for SmokeTQt)
AC_CACHE_VAL(kde_have_smokeqt,
AC_CACHE_VAL(kde_have_smoketqt,
[
kde_ldflags_safe="$LDFLAGS"
@ -244,7 +244,7 @@ AC_CACHE_VAL(kde_have_smokeqt,
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
LIBS="-lsmokeqt"
LIBS="-lsmoketqt"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
LD_LIBRARY_PATH="$qt_libraries"
@ -256,8 +256,8 @@ AC_CACHE_VAL(kde_have_smokeqt,
[
Smoke::Index i;
],
kde_have_smokeqt=yes,
kde_have_smokeqt=no
kde_have_smoketqt=yes,
kde_have_smoketqt=no
)
LDFLAGS=$kde_ldflags_safe
@ -268,9 +268,9 @@ AC_CACHE_VAL(kde_have_smokeqt,
AC_LANG_RESTORE
AC_MSG_RESULT($kde_have_smokeqt)
AC_MSG_RESULT($kde_have_smoketqt)
$1=$kde_have_smokeqt
$1=$kde_have_smoketqt
])

8
smoke/qt/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
lib_LTLIBRARIES = libsmokeqt.la
lib_LTLIBRARIES = libsmoketqt.la
# set the include path for X, qt and KDE
INCLUDES = -I$(srcdir)/.. $(all_includes)
@ -6,12 +6,12 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
# the library search path.
libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
# the libraries to link against.
libsmokeqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
# which sources should be compiled for perlqtkde
libsmokeqt_la_SOURCES = smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
libsmoketqt_la_SOURCES = smokedata.cpp 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

78
smoke/qt/Makefile.in
Unescape View File

@ -193,7 +193,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
x_includes = @x_includes@
x_libraries = @x_libraries@
lib_LTLIBRARIES = libsmokeqt.la
lib_LTLIBRARIES = libsmoketqt.la
# set the include path for X, qt and KDE
INCLUDES = -I$(srcdir)/.. $(all_includes)
@ -201,15 +201,15 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
EXTRA_DIST = generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
# the library search path.
#>- libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
#>- libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
#>+ 1
libsmokeqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
# the libraries to link against.
libsmokeqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
# which sources should be compiled for perlqtkde
libsmokeqt_la_SOURCES = smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
libsmoketqt_la_SOURCES = smokedata.cpp 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
@ -219,18 +219,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = qtguess.pl generate.pl
LTLIBRARIES = $(lib_LTLIBRARIES)
libsmokeqt_la_DEPENDENCIES =
am_libsmokeqt_la_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
libsmoketqt_la_DEPENDENCIES =
am_libsmoketqt_la_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
#>- libsmokeqt_la_OBJECTS = $(am_libsmokeqt_la_OBJECTS)
#>- libsmoketqt_la_OBJECTS = $(am_libsmoketqt_la_OBJECTS)
#>+ 6
libsmokeqt_la_final_OBJECTS = libsmokeqt_la.all_cpp.lo
libsmokeqt_la_nofinal_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
libsmoketqt_la_final_OBJECTS = libsmoketqt_la.all_cpp.lo
libsmoketqt_la_nofinal_OBJECTS = smokedata.lo x_1.lo x_2.lo x_3.lo x_4.lo \
x_5.lo x_6.lo x_7.lo x_8.lo x_9.lo x_10.lo x_11.lo x_12.lo \
x_13.lo x_14.lo x_15.lo x_16.lo x_17.lo x_18.lo x_19.lo x_20.lo
@KDE_USE_FINAL_FALSE@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@libsmokeqt_la_OBJECTS = $(libsmokeqt_la_final_OBJECTS)
@KDE_USE_FINAL_FALSE@libsmoketqt_la_OBJECTS = $(libsmoketqt_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@libsmoketqt_la_OBJECTS = $(libsmoketqt_la_final_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
@ -247,7 +247,7 @@ am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@ ./$(DEPDIR)/x_7.Plo ./$(DEPDIR)/x_8.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/x_9.Plo
#>+ 23
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libsmokeqt_la.all_cpp.P ./$(DEPDIR)/smokedata.Plo ./$(DEPDIR)/x_1.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libsmoketqt_la.all_cpp.P ./$(DEPDIR)/smokedata.Plo ./$(DEPDIR)/x_1.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/x_10.Plo ./$(DEPDIR)/x_11.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/x_12.Plo ./$(DEPDIR)/x_13.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/x_14.Plo ./$(DEPDIR)/x_15.Plo \
@ -288,9 +288,9 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(libsmokeqt_la_SOURCES)
DIST_SOURCES = $(libsmoketqt_la_SOURCES)
DIST_COMMON = Makefile.am Makefile.in generate.pl.in qtguess.pl.in
SOURCES = $(libsmokeqt_la_SOURCES)
SOURCES = $(libsmoketqt_la_SOURCES)
#>- all: all-am
#>+ 1
@ -339,11 +339,11 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
#>- libsmokeqt.la: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES)
#>- libsmoketqt.la: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES)
#>+ 2
@KDE_USE_CLOSURE_TRUE@libsmokeqt.la: libsmokeqt.la.closure $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@libsmokeqt.la: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libsmokeqt_la_LDFLAGS) $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_LIBADD) $(LIBS)
@KDE_USE_CLOSURE_TRUE@libsmoketqt.la: libsmoketqt.la.closure $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@libsmoketqt.la: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libsmoketqt_la_LDFLAGS) $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@ -611,17 +611,17 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
#>+ 8
libsmokeqt.la.closure: $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_DEPENDENCIES)
@echo "int main() {return 0;}" > libsmokeqt_la_closure.cpp
@$(LTCXXCOMPILE) -c libsmokeqt_la_closure.cpp
$(CXXLINK) libsmokeqt_la_closure.lo $(libsmokeqt_la_LDFLAGS) $(libsmokeqt_la_OBJECTS) $(libsmokeqt_la_LIBADD) $(LIBS)
@rm -f libsmokeqt_la_closure.* libsmokeqt.la.closure
@echo "timestamp" > libsmokeqt.la.closure
libsmoketqt.la.closure: $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_DEPENDENCIES)
@echo "int main() {return 0;}" > libsmoketqt_la_closure.cpp
@$(LTCXXCOMPILE) -c libsmoketqt_la_closure.cpp
$(CXXLINK) libsmoketqt_la_closure.lo $(libsmoketqt_la_LDFLAGS) $(libsmoketqt_la_OBJECTS) $(libsmoketqt_la_LIBADD) $(LIBS)
@rm -f libsmoketqt_la_closure.* libsmoketqt.la.closure
@echo "timestamp" > libsmoketqt.la.closure
#>+ 3
clean-closures:
-rm -f libsmokeqt.la.closure
-rm -f libsmoketqt.la.closure
#>+ 2
docs-am:
@ -644,33 +644,33 @@ bcheck-am:
test ! -s bchecktest.cc.oldclass || test ! -s bchecktest.cc.class || cmp -s bchecktest.cc.oldclass bchecktest.cc.class
#>+ 11
libsmokeqt_la.all_cpp.cpp: $(srcdir)/Makefile.in smokedata.cpp 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
@echo 'creating libsmokeqt_la.all_cpp.cpp ...'; \
rm -f libsmokeqt_la.all_cpp.files libsmokeqt_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libsmokeqt_la.all_cpp.final; \
libsmoketqt_la.all_cpp.cpp: $(srcdir)/Makefile.in smokedata.cpp 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
@echo 'creating libsmoketqt_la.all_cpp.cpp ...'; \
rm -f libsmoketqt_la.all_cpp.files libsmoketqt_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libsmoketqt_la.all_cpp.final; \
for file in smokedata.cpp 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 ; do \
echo "#include \"$$file\"" >> libsmokeqt_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmokeqt_la.all_cpp.final; \
echo "#include \"$$file\"" >> libsmoketqt_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsmoketqt_la.all_cpp.final; \
done; \
cat libsmokeqt_la.all_cpp.final libsmokeqt_la.all_cpp.files > libsmokeqt_la.all_cpp.cpp; \
rm -f libsmokeqt_la.all_cpp.final libsmokeqt_la.all_cpp.files
cat libsmoketqt_la.all_cpp.final libsmoketqt_la.all_cpp.files > libsmoketqt_la.all_cpp.cpp; \
rm -f libsmoketqt_la.all_cpp.final libsmoketqt_la.all_cpp.files
#>+ 3
clean-final:
-rm -f libsmokeqt_la.all_cpp.cpp
-rm -f libsmoketqt_la.all_cpp.cpp
#>+ 2
final:
$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" all-am
$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" all-am
#>+ 2
final-install:
$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_final_OBJECTS)" install-am
$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_final_OBJECTS)" install-am
#>+ 2
no-final:
$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" all-am
$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
$(MAKE) libsmokeqt_la_OBJECTS="$(libsmokeqt_la_nofinal_OBJECTS)" install-am
$(MAKE) libsmoketqt_la_OBJECTS="$(libsmoketqt_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean

6
smoke/qt/generate_makefile_am.pl
Unescape View File

@ -14,16 +14,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;

Write Preview
Loading…
Cancel
Save