diff options
Diffstat (limited to 'parts/appwizard/common')
| m--------- | parts/appwizard/common/admin | 0 | ||||
| -rw-r--r-- | parts/appwizard/common/gnome/macros/curses.m4 | 18 | ||||
| -rw-r--r-- | parts/appwizard/common/gnome/macros/gnome-fileutils.m4 | 67 | ||||
| -rw-r--r-- | parts/appwizard/common/gnome2/macros/curses.m4 | 18 | ||||
| -rwxr-xr-x | parts/appwizard/common/incadmin/config.guess | 108 | ||||
| -rwxr-xr-x | parts/appwizard/common/incadmin/config.sub | 57 | ||||
| -rwxr-xr-x | parts/appwizard/common/incadmin/depcomp | 39 | ||||
| -rw-r--r-- | parts/appwizard/common/incadmin/ltmain.sh | 51 | ||||
| -rw-r--r-- | parts/appwizard/common/scons/admin/generic.py | 48 | ||||
| -rw-r--r-- | parts/appwizard/common/scons/admin/kde.py | 130 |
10 files changed, 93 insertions, 443 deletions
diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin -Subproject c23f9f693475149602b052e66e7e9d9e726e299 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/parts/appwizard/common/gnome/macros/curses.m4 b/parts/appwizard/common/gnome/macros/curses.m4 index 3dd4ffaa..cbeb9edf 100644 --- a/parts/appwizard/common/gnome/macros/curses.m4 +++ b/parts/appwizard/common/gnome/macros/curses.m4 @@ -111,13 +111,6 @@ AC_DEFUN(AC_CHECK_CURSES,[ fi ]) - AC_ARG_WITH(osf1-curses, - [ --with-osf1-curses Used to force OSF/1 curses],[ - if test x$withval = xyes; then - AC_USE_OSF1_CURSES - fi - ]) - AC_ARG_WITH(vcurses, [ --with-vcurses[=incdir] Used to force SysV curses], if test x$withval != xyes; then @@ -164,17 +157,6 @@ AC_DEFUN(AC_USE_SUNOS_CURSES, [ AC_MSG_RESULT(Please note that some screen refreshs may fail) ]) -AC_DEFUN(AC_USE_OSF1_CURSES, [ - AC_MSG_RESULT(Using OSF1 curses) - search_ncurses=false - screen_manager="OSF1 curses" - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) - CURSES_LIBS="-lcurses" -]) - AC_DEFUN(AC_USE_SYSV_CURSES, [ AC_MSG_RESULT(Using SysV curses) AC_DEFINE(HAS_CURSES) diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 index 7c11a785..86eaca65 100644 --- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 +++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 @@ -28,9 +28,6 @@ if test x$cross_compiling = xyes ; then freebsd*) fu_cv_sys_stat_statfs2_bsize=yes ;; - osf*) - fu_cv_sys_stat_statfs3_osf1=yes - ;; esac fi @@ -111,25 +108,6 @@ fi fi if test -z "$list_mounted_fs"; then -# DEC Alpha running OSF/1. -AC_MSG_CHECKING([for getfsstat function]) -AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, -[AC_TRY_LINK([ -#include <sys/types.h> -#include <sys/mount.h> -#include <sys/fs_types.h>], -[struct statfs *stats; -int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], -fu_cv_sys_mounted_getsstat=yes, -fu_cv_sys_mounted_getsstat=no)]) -AC_MSG_RESULT($fu_cv_sys_mounted_getsstat) -if test $fu_cv_sys_mounted_getsstat = yes; then -list_mounted_fs=found -AC_DEFINE(MOUNTED_GETFSSTAT) -fi -fi - -if test -z "$list_mounted_fs"; then # AIX. AC_MSG_CHECKING([for mntctl function and struct vmount]) AC_CACHE_VAL(fu_cv_sys_mounted_vmount, @@ -160,27 +138,6 @@ AC_DEFINE(MOUNTED_FREAD_FSTYP) fi fi -if test -z "$list_mounted_fs"; then -# 4.4BSD and DEC OSF/1. -AC_MSG_CHECKING([for getmntinfo function]) -AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, -[ -ok= -if test $ac_cv_func_getmntinfo = yes; then -AC_EGREP_HEADER(f_type;, sys/mount.h, -ok=yes) -fi -test -n "$ok" \ -&& fu_cv_sys_mounted_getmntinfo=yes \ -|| fu_cv_sys_mounted_getmntinfo=no -]) -AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) -if test $fu_cv_sys_mounted_getmntinfo = yes; then -list_mounted_fs=found -AC_DEFINE(MOUNTED_GETMNTINFO) -fi -fi - # FIXME: add a test for netbsd-1.1 here if test -z "$list_mounted_fs"; then @@ -243,30 +200,6 @@ fi fi if test $space = no; then -# DEC Alpha running OSF/1 -AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) -AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, -[AC_TRY_RUN([ -#include <sys/param.h> -#include <sys/types.h> -#include <sys/mount.h> -main () -{ -struct statfs fsd; -fsd.f_fsize = 0; -exit (statfs (".", &fsd, sizeof (struct statfs))); -}], -fu_cv_sys_stat_statfs3_osf1=yes, -fu_cv_sys_stat_statfs3_osf1=no, -fu_cv_sys_stat_statfs3_osf1=no)]) -AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) -if test $fu_cv_sys_stat_statfs3_osf1 = yes; then -space=yes -AC_DEFINE(STAT_STATFS3_OSF1) -fi -fi - -if test $space = no; then # AIX AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl member (AIX, 4.3BSD)]) diff --git a/parts/appwizard/common/gnome2/macros/curses.m4 b/parts/appwizard/common/gnome2/macros/curses.m4 index 5307e13d..57d701e9 100644 --- a/parts/appwizard/common/gnome2/macros/curses.m4 +++ b/parts/appwizard/common/gnome2/macros/curses.m4 @@ -111,13 +111,6 @@ AC_DEFUN([AC_CHECK_CURSES],[ fi ]) - AC_ARG_WITH(osf1-curses, - [ --with-osf1-curses Used to force OSF/1 curses],[ - if test x$withval = xyes; then - AC_USE_OSF1_CURSES - fi - ]) - AC_ARG_WITH(vcurses, [ --with-vcurses[=incdir] Used to force SysV curses], if test x$withval != xyes; then @@ -164,17 +157,6 @@ AC_DEFUN([AC_USE_SUNOS_CURSES], [ AC_MSG_RESULT(Please note that some screen refreshs may fail) ]) -AC_DEFUN([AC_USE_OSF1_CURSES], [ - AC_MSG_RESULT(Using OSF1 curses) - search_ncurses=false - screen_manager="OSF1 curses" - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) - CURSES_LIBS="-lcurses" -]) - AC_DEFUN([AC_USE_SYSV_CURSES], [ AC_MSG_RESULT(Using SysV curses) AC_DEFINE(HAS_CURSES) diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index aed5d7a0..201d615b 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -216,68 +216,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit ;; @@ -481,22 +419,6 @@ EOF m88k:*:3*:R3*) echo m88k-motorola-sysv3 exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -714,19 +636,6 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit ;; @@ -1080,9 +989,6 @@ EOF Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 @@ -1141,20 +1047,6 @@ EOF SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 diff --git a/parts/appwizard/common/incadmin/config.sub b/parts/appwizard/common/incadmin/config.sub index bc16da11..a44fd184 100755 --- a/parts/appwizard/common/incadmin/config.sub +++ b/parts/appwizard/common/incadmin/config.sub @@ -184,34 +184,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -714,10 +686,6 @@ case $basic_machine in hppa-next) os=-nextstep3 ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; hppro) basic_machine=hppa1.1-hp os=-proelf @@ -929,10 +897,6 @@ case $basic_machine in basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; parisc) basic_machine=hppa-unknown os=-linux @@ -1339,7 +1303,7 @@ case $os in # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -hpux* | -unos* | -luna* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ @@ -1407,12 +1371,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1443,13 +1401,6 @@ case $os in -nsk*) os=-nsk ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; -tpf*) os=-tpf ;; @@ -1619,9 +1570,6 @@ case $basic_machine in *-cbm) os=-amigaos ;; - *-dg) - os=-dgux - ;; *-dolphin) os=-sysv3 ;; @@ -1718,9 +1666,6 @@ case $basic_machine in -unos*) vendor=crds ;; - -dgux*) - vendor=dg - ;; -luna*) vendor=omron ;; diff --git a/parts/appwizard/common/incadmin/depcomp b/parts/appwizard/common/incadmin/depcomp index e220f925..9db17ebc 100755 --- a/parts/appwizard/common/incadmin/depcomp +++ b/parts/appwizard/common/incadmin/depcomp @@ -198,8 +198,6 @@ aix) ;; icc) - # Must come before tru64. - # Intel's C compiler understands `-MD -MF file'. However # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c # will fill foo.d with something like @@ -227,43 +225,6 @@ icc) rm -f "$tmpdepfile" ;; -tru64) - # The Tru64 AIX compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - - tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` - if test "$libtool" = yes; then - "$@" -Wc,-MD - else - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 3f35292a..7de1caf8 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -88,7 +88,6 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then else case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh # NLS nuisances: We save the old values to restore during execute mode. @@ -2433,10 +2432,6 @@ typedef struct { runtime relocations are performed -- see ld's documentation on pseudo-relocs. */" lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; *) lt_dlsym_const=const ;; esac @@ -2732,7 +2727,6 @@ if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then else case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -3476,7 +3470,6 @@ EOF XFREE (actual_cwrapper_path); XFREE (actual_cwrapper_name); - lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ lt_setenv ("DUALCASE", "1"); /* for MSK sh */ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); @@ -4539,10 +4532,6 @@ func_mode_link () deplibs="$deplibs System.ltframework" continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work test "X$arg" = "X-lc" && continue @@ -4565,10 +4554,8 @@ func_mode_link () continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) + arch|-isysroot) compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -4748,12 +4735,6 @@ func_mode_link () continue ;; - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler # -r[0-9][0-9]* specifies the processor on the SGI compiler # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler @@ -5674,7 +5655,6 @@ func_mode_link () if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; *-*-sysv4*uw2*) add_dir="-L$dir" ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ *-*-unixware7*) add_dir="-L$dir" ;; @@ -6192,7 +6172,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows|none) + darwin|linux|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" @@ -6317,26 +6297,6 @@ func_mode_link () versuffix="$major.$age.$revision" ;; - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - qnx) major=".$current" versuffix=".$current" @@ -6496,9 +6456,6 @@ func_mode_link () *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work ;; @@ -6529,9 +6486,7 @@ func_mode_link () pass_all) # Don't check for shared/static. Everything works. # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. + # whether the library exists or not. newdeplibs=$deplibs ;; test_compile) diff --git a/parts/appwizard/common/scons/admin/generic.py b/parts/appwizard/common/scons/admin/generic.py index 55c37c90..52c4e3bc 100644 --- a/parts/appwizard/common/scons/admin/generic.py +++ b/parts/appwizard/common/scons/admin/generic.py @@ -31,18 +31,18 @@ def generate(env): env['HELP']=1 if env['HELP']: - print """ + print(""" """+BOLD+"""*** Generic options *** -----------------------"""+NORMAL+""" """+BOLD+"""* debug """+NORMAL+""": debug=1 (-g) or debug=full (-g3, slower) else use environment CXXFLAGS, or -O2 by default """+BOLD+"""* prefix """+NORMAL+""": the installation path """+BOLD+"""* extraincludes """+NORMAL+""": a list of paths separated by ':' ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/include:/usr/local -"""+NORMAL +"""+NORMAL) ## Global cache directory ## Put all project files in it so a rm -rf cache will clean up the config - if not env.has_key('CACHEDIR'): + if 'CACHEDIR' not in env: env['CACHEDIR'] = os.getcwd()+'/cache/' if not os.path.isdir(env['CACHEDIR']): os.mkdir(env['CACHEDIR']) @@ -56,9 +56,9 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # Special trick for installing rpms ... env['DESTDIR']='' - if 'install' in sys.argv and os.environ.has_key('DESTDIR'): + if 'install' in sys.argv and 'DESTDIR' in os.environ: env['DESTDIR']=os.environ['DESTDIR']+'/' - print CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR'] + print(CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR']) # load the options from SCons.Options import Options, PathOption @@ -89,7 +89,7 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ env['_CONFIGURE']=0 # configure the environment if needed - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('ISCONFIGURED')): + if not env['HELP'] and (env['_CONFIGURE'] or 'ISCONFIGURED' not in env): import re def makeHashTable(args): @@ -108,40 +108,40 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ env['ARGS']=makeHashTable(sys.argv) # be paranoid, unset existing variables - if env.has_key('KDECXXFLAGS'): + if 'KDECXXFLAGS' in env: env.__delitem__('KDECXXFLAGS') - if env.has_key('KDECCFLAGS'): + if 'KDECCFLAGS' in env: env.__delitem__('KDECCFLAGS') - if env.has_key('KDELINKFLAGS'): + if 'KDELINKFLAGS' in env: env.__delitem__('KDELINKFLAGS') - if env.has_key('PREFIX'): + if 'PREFIX' in env: env.__delitem__('PREFIX') - if env.has_key('EXTRAINCLUDES'): + if 'EXTRAINCLUDES' in env: env.__delitem__('EXTRAINCLUDES') - if env.has_key('ISCONFIGURED'): + if 'ISCONFIGURED' in env: env.__delitem__('ISCONFIGURED') if env['ARGS'].get('debug', None): debuglevel = env['ARGS'].get('debug', None) - print CYAN+'** Enabling debug for the project **' + NORMAL + print(CYAN+'** Enabling debug for the project **' + NORMAL) if (debuglevel == "full"): env['KDECXXFLAGS'] = ['-DDEBUG', '-g3'] else: env['KDECXXFLAGS'] = ['-DDEBUG', '-g'] else: - if os.environ.has_key('CXXFLAGS'): + if 'CXXFLAGS' in os.environ: # user-defined flags (gentooers will be elighted) env['KDECXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] ) env.Append( KDECXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] ) else: env.Append(KDECXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG']) - if os.environ.has_key('CFLAGS'): + if 'CFLAGS' in os.environ: env['KDECCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] ) ## FreeBSD settings (contributed by will at freebsd dot org) if os.uname()[0] == "FreeBSD": - if os.environ.has_key('PTHREAD_LIBS'): + if 'PTHREAD_LIBS' in os.environ: env.AppendUnique( KDELINKFLAGS = SCons.Util.CLVar( os.environ['PTHREAD_LIBS'] ) ) else: syspf = os.popen('/sbin/sysctl kern.osreldate') @@ -159,15 +159,15 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # User-specified prefix if env['ARGS'].get('prefix', None): env['PREFIX'] = env['ARGS'].get('prefix', None) - print CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL - elif env.has_key('PREFIX'): + print(CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL) + elif 'PREFIX' in env: env.__delitem__('PREFIX') # User-specified include paths env['EXTRAINCLUDES'] = env['ARGS'].get('extraincludes', None) if env['ARGS'].get('extraincludes', None): - print CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL - elif env.has_key('EXTRAINCLUDES'): + print(CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL) + elif 'EXTRAINCLUDES' in env: env.__delitem__('EXTRAINCLUDES') env['ISCONFIGURED']=1 @@ -175,16 +175,16 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # And finally save the options in the cache opts.Save(cachefile, env) - if env.has_key('KDECXXFLAGS'): + if 'KDECXXFLAGS' in env: env.AppendUnique( CPPFLAGS = env['KDECXXFLAGS'] ) - if env.has_key('KDECCFLAGS'): + if 'KDECCFLAGS' in env: env.AppendUnique( CCFLAGS = env['KDECCFLAGS'] ) - if env.has_key('KDELINKFLAGS'): + if 'KDELINKFLAGS' in env: env.AppendUnique( LINKFLAGS = env['KDELINKFLAGS'] ) - if env.has_key('EXTRAINCLUDES'): + if 'EXTRAINCLUDES' in env: incpaths = [] for dir in str(env['EXTRAINCLUDES']).split(':'): incpaths.append( dir ) diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 84b2c812..3d54ce93 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -43,109 +43,109 @@ def detect_kde(env): libdir = libdir+libsuffix ## Detect the kde libraries - print "Checking for tde-config : ", + print("Checking for tde-config : ", end=' ') kde_config = os.popen("which tde-config 2>/dev/null").read().strip() if len(kde_config): - print GREEN+"tde-config was found"+NORMAL + print(GREEN+"tde-config was found"+NORMAL) else: - print RED+"tde-config was NOT found in your PATH"+NORMAL - print "Make sure kde is installed properly" - print "(missing package tdebase-devel?)" + print(RED+"tde-config was NOT found in your PATH"+NORMAL) + print("Make sure kde is installed properly") + print("(missing package tdebase-devel?)") env.Exit(1) env['TDEDIR'] = os.popen('tde-config -prefix').read().strip() - print "Checking for kde version : ", + print("Checking for kde version : ", end=' ') kde_version = os.popen("tde-config --version|grep KDE").read().strip().split()[1] if int(kde_version[0]) != 3 or int(kde_version[2]) < 2: - print RED+kde_version - print RED+"Your kde version can be too old"+NORMAL - print RED+"Please make sure kde is at least 3.2"+NORMAL + print(RED+kde_version) + print(RED+"Your kde version can be too old"+NORMAL) + print(RED+"Please make sure kde is at least 3.2"+NORMAL) else: - print GREEN+kde_version+NORMAL + print(GREEN+kde_version+NORMAL) ## Detect the qt library - print "Checking for the qt library : ", + print("Checking for the qt library : ", end=' ') qtdir = os.getenv("TQTDIR") if qtdir: - print GREEN+"qt is in "+qtdir+NORMAL + print(GREEN+"qt is in "+qtdir+NORMAL) else: libdir = os.popen('tde-config --expandvars --install lib').read().strip() libtdeuiSO = libdir+'/'+getSOfromLA(libdir+'/libtdeui.la') m = re.search('(.*)/lib/libtqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libtqt').read().strip().split()[2]) if m: qtdir = m.group(1) - print YELLOW+"qt was found as "+m.group(1)+NORMAL + print(YELLOW+"qt was found as "+m.group(1)+NORMAL) else: - print RED+"qt was not found"+NORMAL - print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL + print(RED+"qt was not found"+NORMAL) + print(RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL) env.Exit(1) env['TQTDIR'] = qtdir.strip() ## Find the necessary programs uic and moc - print "Checking for uic : ", + print("Checking for uic : ", end=' ') uic = qtdir + "/bin/uic" if os.path.isfile(uic): - print GREEN+"uic was found as "+uic+NORMAL + print(GREEN+"uic was found as "+uic+NORMAL) else: uic = os.popen("which uic 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print(YELLOW+"uic was found as "+uic+NORMAL) else: uic = os.popen("which uic 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print(YELLOW+"uic was found as "+uic+NORMAL) else: - print RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL + print(RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL) env.Exit(1) env['QT_UIC'] = uic - print "Checking for moc : ", + print("Checking for moc : ", end=' ') moc = qtdir + "/bin/moc" if os.path.isfile(moc): - print GREEN + "moc was found as " + moc + NORMAL + print(GREEN + "moc was found as " + moc + NORMAL) else: moc = os.popen("which moc 2>/dev/null").read().strip() if len(moc): - print YELLOW + "moc was found as " + moc + NORMAL + print(YELLOW + "moc was found as " + moc + NORMAL) elif os.path.isfile("/usr/share/qt3/bin/moc"): moc = "/usr/share/qt3/bin/moc" - print YELLOW + "moc was found as " + moc + NORMAL + print(YELLOW + "moc was found as " + moc + NORMAL) else: - print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL + print(RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL) env.Exit(1) env['QT_MOC'] = moc ## check for the qt and kde includes - print "Checking for the qt includes : ", + print("Checking for the qt includes : ", end=' ') if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"): # The user told where to look for and it looks valid - print GREEN + "ok " + qtincludes + NORMAL + print(GREEN + "ok " + qtincludes + NORMAL) else: if os.path.isfile(qtdir + "/include/qtqlayout.h"): # Automatic detection - print GREEN + "ok " + qtdir + "/include/ " + NORMAL + print(GREEN + "ok " + qtdir + "/include/ " + NORMAL) qtincludes = qtdir + "/include/" elif os.path.isfile("/usr/include/qt3/qtqlayout.h"): # Debian probably - print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL + print(YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL) qtincludes = "/usr/include/qt3" else: - print RED + "the qt headers were not found" + NORMAL + print(RED + "the qt headers were not found" + NORMAL) env.Exit(1) - print "Checking for the kde includes : ", + print("Checking for the kde includes : ", end=' ') kdeprefix = os.popen("tde-config --prefix").read().strip() if not kdeincludes: kdeincludes = kdeprefix+"/include/" if os.path.isfile(kdeincludes + "/klineedit.h"): - print GREEN + "ok " + kdeincludes + NORMAL + print(GREEN + "ok " + kdeincludes + NORMAL) else: if os.path.isfile(kdeprefix+"/include/tde/klineedit.h"): # Debian, Fedora probably - print YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL + print(YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL) kdeincludes = kdeprefix + "/include/tde/" else: - print RED + "The kde includes were NOT found" + NORMAL + print(RED + "The kde includes were NOT found" + NORMAL) env.Exit(1) if prefix: @@ -206,7 +206,7 @@ def detect_kde(env): def generate(env): """"Set up the qt and kde environment and builders - the moc part is difficult to understand """ if env['HELP']: - print """ + print(""" """+BOLD+"""*** KDE options *** -------------------"""+NORMAL+""" """+BOLD+"""* prefix """+NORMAL+""": base install path, ie: /usr/local @@ -219,7 +219,7 @@ def generate(env): """+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs """+BOLD+"""* tqtlibs """+NORMAL+""": same punishment, for qt libraries ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt -"""+NORMAL +"""+NORMAL) import SCons.Defaults import SCons.Tool @@ -264,8 +264,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt objBuilder = getattr(env, self.objBuilderName) # some regular expressions: - # Q_OBJECT detection - q_object_search = re.compile(r'[^A-Za-z0-9]Q_OBJECT[^A-Za-z0-9]') + # TQ_OBJECT detection + q_object_search = re.compile(r'[^A-Za-z0-9]TQ_OBJECT[^A-Za-z0-9]') # The following is kind of hacky to get builders working properly (FIXME) ?? objBuilderEnv = objBuilder.env @@ -280,12 +280,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if not obj.has_builder(): # binary obj file provided if qtdebug: - print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj) + print("scons: qt: '%s' seems to be a binary. Discarded." % str(obj)) continue cpp = obj.sources[0] if not splitext(str(cpp))[1] in source_extensions: if qtdebug: - print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp) + print("scons: qt: '%s' is no cxx file. Discarded." % str(cpp)) # c or fortran source continue #cpp_contents = comment.sub('', cpp.get_contents()) @@ -300,7 +300,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ui = find_file(uiname, (cpp.get_dir(),), FS.File) if ui: if qtdebug: - print "scons: qt: found .ui file of header" #% (str(h), str(cpp)) + print("scons: qt: found .ui file of header") #% (str(h), str(cpp)) #h_contents = comment.sub('', h.get_contents()) break @@ -315,18 +315,18 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt h = find_file(hname, (cpp.get_dir(),), FS.File) if h: if qtdebug: - print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp)) + print("scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))) #h_contents = comment.sub('', h.get_contents()) h_contents = h.get_contents() break if not h and qtdebug: - print "scons: qt: no header for '%s'." % (str(cpp)) + print("scons: qt: no header for '%s'." % (str(cpp))) if h and q_object_search.search(h_contents): - # h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file + # h file with the TQ_OBJECT macro found -> add .moc or _moc.cpp file moc_cpp = None - if env.has_key('NOMOCSCAN'): + if 'NOMOCSCAN' in env: moc_cpp = env.Moc(h) else: reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)' @@ -338,12 +338,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt moc_o = objBuilder(moc_cpp) out_sources.append(moc_o) if qtdebug: - print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0])) + print("scons: qt: found TQ_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0]))) if cpp and q_object_search.search(cpp_contents): - print "error, bksys cannot handle cpp files with Q_OBJECT classes" - print "if you are sure this is a feature worth the effort, " - print "report this to the authors tnagyemail-mail yahoo.fr" + print("error, bksys cannot handle cpp files with TQ_OBJECT classes") + print("if you are sure this is a feature worth the effort, ") + print("report this to the authors tnagyemail-mail yahoo.fr") # restore the original env attributes (FIXME) objBuilder.env = objBuilderEnv @@ -392,7 +392,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.Update(env) # reconfigure when things are missing - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR')): + if not env['HELP'] and (env['_CONFIGURE'] or 'TQTDIR' not in env or 'TDEDIR' not in env): detect_kde(env) # finally save the configuration to the cache file @@ -501,7 +501,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if len(source) <2: if not os.path.isfile(str(source[0])): - print RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL + print(RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL) return target, source kfcgfilename="" kcfgFileDeclRx = re.compile("^[fF]ile\s*=\s*(.+)\s*$") @@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt def dcopGenerator(target, source, env, for_signature): act=[] act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)') - act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path) + act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path) return act def dcopEmitter(target, source, env): @@ -604,7 +604,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## return a list of things def make_list(e): - if type(e) is types.ListType: + if type(e) is list: return e else: return e.split() @@ -650,13 +650,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt for file in ui_files: for ofile in other_files: if ofile == file: - print RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL - print "Files generated by uic (file.h, file.cpp must not be included" + print(RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL) + print("Files generated by uic (file.h, file.cpp must not be included") for file in kcfg_files: for ofile in other_files: if ofile == file: - print RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL - print "Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included" + print(RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL) + print("Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included") return src @@ -670,8 +670,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return basedir=env['DESTDIR'] if len(restype)>0: - if not lenv.has_key(restype): - print RED+"unknown resource type "+restype+NORMAL + if restype not in lenv: + print(RED+"unknown resource type "+restype+NORMAL) else: basedir += lenv[restype]+'/' #print file # <- useful to trace stuff :) @@ -684,8 +684,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return basedir=env['DESTDIR'] if len(restype)>0: - if not lenv.has_key(restype): - print RED+"unknown resource type "+restype+NORMAL + if restype not in lenv: + print(RED+"unknown resource type "+restype+NORMAL) else: basedir += lenv[restype]+'/' install_list = env.InstallAs(basedir+destfile, file) @@ -697,7 +697,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt The program is installed except if one sets env['NOAUTOINSTALL'] """ src = KDEfiles(lenv, target, source) program_list = lenv.Program(target, src) - if not lenv.has_key('NOAUTOINSTALL'): + if 'NOAUTOINSTALL' not in lenv: KDEinstall(lenv, 'KDEBIN', '', target) return program_list @@ -708,7 +708,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt lenv['LIBPREFIX']=libprefix library_list = lenv.SharedLibrary(target, src) lafile_list = lenv.LaFile(target, library_list) - if not lenv.has_key('NOAUTOINSTALL'): + if 'NOAUTOINSTALL' not in lenv: install_dir = 'KDEMODULE' if kdelib==1: install_dir = 'KDELIBPATH' @@ -800,13 +800,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt filename = lst[ len(lst) - 1 ] tmp = filename.split('-') if len(tmp)!=3: - print RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL + print(RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL) continue [icon_dir, icon_type, icon_filename]=tmp try: destfile = '%s/%s/%s/%s' % (lenv['KDEICONS'], dir_dic[icon_dir], type_dic[icon_type], icon_filename) except KeyError: - print RED+'WARNING: unknown icon type: '+iconfile+NORMAL + print(RED+'WARNING: unknown icon type: '+iconfile+NORMAL) continue ## Do not use KDEinstallas here, as parsing from an ide will be necessary if env['_INSTALL']: |