dist-svn Mailing List for dist (Page 7)
Brought to you by:
rmanfredi
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(14) |
Sep
|
Oct
|
Nov
(2) |
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(7) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(17) |
Dec
(13) |
2011 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
(9) |
Dec
(4) |
2012 |
Jan
(7) |
Feb
(20) |
Mar
(7) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
(8) |
Dec
(3) |
2013 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
(1) |
Jul
|
Aug
(2) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
(1) |
From: <rma...@us...> - 2010-11-28 23:08:59
|
Revision: 50 http://dist.svn.sourceforge.net/dist/?rev=50&view=rev Author: rmanfredi Date: 2010-11-28 23:08:52 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Regenerated. Modified Paths: -------------- trunk/dist/Configure Modified: trunk/dist/Configure =================================================================== --- trunk/dist/Configure 2010-11-28 23:06:23 UTC (rev 49) +++ trunk/dist/Configure 2010-11-28 23:08:52 UTC (rev 50) @@ -16,9 +16,9 @@ # The dist package (which contains metaconfig) is available via SVN: # svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist -# $Id: Head.U 35 2010-11-27 14:04:55Z rmanfredi $ +# $Id: Head.U 41 2010-11-28 00:21:26Z rmanfredi $ # -# Generated on Sat Nov 27 15:09:44 CET 2010 [metaconfig 3.5-34] +# Generated on Mon Nov 29 00:07:52 CET 2010 [metaconfig 3.5-49] cat >c1$$ <<EOF ARGGGHHHH!!!!! @@ -63,7 +63,7 @@ OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'` elif test -n "$DJGPP"; then case "X${MACHTYPE:-nonesuchmach}" in - *cygwin) ;; + *cygwin|*msys) ;; *) p_=\; ;; esac fi @@ -174,6 +174,7 @@ d_eunice='' d_linux='' d_os2='' +d_windows='' d_xenix='' _exe='' eunicefix='' @@ -247,6 +248,8 @@ vi='' zcat='' zip='' +incpath='' +mips_type='' hint='' myuname='' osname='' @@ -339,8 +342,6 @@ startsh='' sysman='' trnl='' -incpath='' -mips_type='' usrinc='' CONFIG='' @@ -714,7 +715,7 @@ esac shift ;; - -V) echo "$me generated by metaconfig 3.5-34." >&2 + -V) echo "$me generated by metaconfig 3.5-49." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; @@ -1037,7 +1038,6 @@ rm -f missing x?? : Find the appropriate value for a newline for tr -echo " " if test -n "$DJGPP"; then trnl='\012' fi @@ -1063,8 +1063,6 @@ EOM exit 1 -else - echo "We'll use '$trnl' to transliterate a newline." fi : compute the number of columns on the terminal for proper question formatting @@ -2473,6 +2471,7 @@ case "$ansexp" in /*) value="$ansexp" ;; [a-zA-Z]:/*) value="$ansexp" ;; + [a-zA-Z]:\\*) value="$ansexp" ;; *) redo=true case "$already" in @@ -2859,10 +2858,12 @@ echo exit 1 >gnu echo exit 1 >linux echo exit 1 >dos +echo exit 1 >windows d_bsd="$undef" d_linux="$undef" d_dos="$undef" d_os2="$undef" +d_windows="$undef" $cat /usr/include/signal.h /usr/include/sys/signal.h >foo 2>/dev/null if test -f /osf_boot || $contains 'OSF/1' /usr/include/ctype.h >/dev/null 2>&1 then @@ -2917,6 +2918,18 @@ d_eunice="$undef" ;; esac +if test -d c:/.; then + case "X${MACHTYPE:-nonesuchmach}" in + *cygwin) echo " "; echo "Hah!... you're running under Cygwin!";; + *msys) echo " "; echo "Hah!... you're running under MinGW!";; + esac + case "X${MACHTYPE:-nonesuchmach}" in + *cygwin|*msys) + echo exit 0 >windows + d_windows="$define" + ;; + esac +fi case "$p_" in :) ;; *) @@ -2924,10 +2937,6 @@ I have the feeling something is not exactly right, however...don't tell me... EOI if test -n "$DJGPP"; then - case "X${MACHTYPE:-nonesuchmach}" in - cygwin) echo "hah!... you're running under Cygwin!";; - *) echo "got it... you're running DOS with DJGPP!";; - esac echo exit 0 >dos d_dos="$define" else @@ -2961,14 +2970,13 @@ echo "Nor is it Venix..." fi fi -chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux -$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux +chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux windows +$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux windows $rm -f foo : What should the include directory be ? echo " " $echo $n "Hmm... $c" -dflt='/usr/include' incpath='' mips_type='' if $test -f /bin/mips && /bin/mips; then @@ -2987,29 +2995,25 @@ fi $rm -f usr.c usr.out echo "and you're compiling with the $mips_type compiler and libraries." - xxx_prompt=y echo "exit 0" >mips else echo "Doesn't look like a MIPS system." - xxx_prompt=n echo "exit 1" >mips fi chmod +x mips $eunicefix mips + +: What should the include directory be ? +echo " " +dflt='/usr/include' case "$usrinc" in -'') ;; +'') dflt="$incpath/usr/include";; *) dflt="$usrinc";; esac -case "$xxx_prompt" in -y) fn=d/ - echo " " - rp='Where are the include files you want to use?' - . ./getfile - usrinc="$ans" - ;; -*) usrinc="$dflt" - ;; -esac +fn=d/ +rp='Where are the include files you want to use?' +. ./getfile +usrinc="$ans" : see if we have to deal with yellow pages, now NIS. if $test -d /usr/etc/yp || $test -d /etc/yp || $test -d /usr/lib/yp; then @@ -4417,6 +4421,7 @@ d_passnames='$d_passnames' d_portable='$d_portable' d_usgnames='$d_usgnames' +d_windows='$d_windows' d_xenix='$d_xenix' date='$date' defeditor='$defeditor' @@ -4549,7 +4554,7 @@ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh $test -f $src/revision.h && \ sed -ne 's/^#define \([A-Za-z0-9_]*\) ".*: \([0-9]*\).*"/\1=\2/p' \ - < revision.h >>config.sh + < $src/revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 23:06:29
|
Revision: 49 http://dist.svn.sourceforge.net/dist/?rev=49&view=rev Author: rmanfredi Date: 2010-11-28 23:06:23 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Regenerated. Modified Paths: -------------- trunk/dist/Makefile.SH trunk/dist/bin/Makefile.SH trunk/dist/jmake/Makefile.SH trunk/dist/kit/Makefile.SH trunk/dist/mcon/Makefile.SH trunk/dist/pat/Makefile.SH Modified: trunk/dist/Makefile.SH =================================================================== --- trunk/dist/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) +++ trunk/dist/Makefile.SH 2010-11-28 23:06:23 UTC (rev 49) @@ -61,7 +61,7 @@ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 25 2008-05-28 11:19:25Z rmanfredi $ +# $X-Id: Jmakefile 48 2010-11-28 23:05:09Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # Modified: trunk/dist/bin/Makefile.SH =================================================================== --- trunk/dist/bin/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) +++ trunk/dist/bin/Makefile.SH 2010-11-28 23:06:23 UTC (rev 49) @@ -63,7 +63,7 @@ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ +# $X-Id: Jmakefile 48 2010-11-28 23:05:09Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # Modified: trunk/dist/jmake/Makefile.SH =================================================================== --- trunk/dist/jmake/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) +++ trunk/dist/jmake/Makefile.SH 2010-11-28 23:06:23 UTC (rev 49) @@ -64,7 +64,7 @@ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 44 2010-11-28 19:03:51Z rmanfredi $ +# $X-Id: Jmakefile 48 2010-11-28 23:05:09Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # Modified: trunk/dist/kit/Makefile.SH =================================================================== --- trunk/dist/kit/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) +++ trunk/dist/kit/Makefile.SH 2010-11-28 23:06:23 UTC (rev 49) @@ -63,7 +63,7 @@ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ +# $X-Id: Jmakefile 48 2010-11-28 23:05:09Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # Modified: trunk/dist/mcon/Makefile.SH =================================================================== --- trunk/dist/mcon/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) +++ trunk/dist/mcon/Makefile.SH 2010-11-28 23:06:23 UTC (rev 49) @@ -63,7 +63,7 @@ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 44 2010-11-28 19:03:51Z rmanfredi $ +# $X-Id: Jmakefile 48 2010-11-28 23:05:09Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # Modified: trunk/dist/pat/Makefile.SH =================================================================== --- trunk/dist/pat/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) +++ trunk/dist/pat/Makefile.SH 2010-11-28 23:06:23 UTC (rev 49) @@ -58,7 +58,7 @@ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ +# $X-Id: Jmakefile 48 2010-11-28 23:05:09Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 23:05:16
|
Revision: 48 http://dist.svn.sourceforge.net/dist/?rev=48&view=rev Author: rmanfredi Date: 2010-11-28 23:05:09 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Added the notion of local_depend and sub_depend. This allows one to do a "make local_depend" after Makefile.SH extraction without having to recurse to subdirs. Modified Paths: -------------- trunk/dist/Jmakefile trunk/dist/Makefile.SH trunk/dist/bin/Jmakefile trunk/dist/bin/Makefile.SH trunk/dist/jmake/Jmakefile trunk/dist/jmake/Makefile.SH trunk/dist/jmake/files/Jmake.rules trunk/dist/jmake/files/Jmake.tmpl trunk/dist/kit/Jmakefile trunk/dist/kit/Makefile.SH trunk/dist/lib/Makefile.SH trunk/dist/mcon/Jmakefile trunk/dist/mcon/Makefile.SH trunk/dist/pat/Jmakefile trunk/dist/pat/Makefile.SH Modified: trunk/dist/Jmakefile =================================================================== --- trunk/dist/Jmakefile 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/Jmakefile 2010-11-28 23:05:09 UTC (rev 48) @@ -26,7 +26,7 @@ all:: /* So that default target is not clobber! */ SetSubdirs(bin mcon jmake pat kit lib) -DependDirs(bin mcon pat jmake kit) +DependSubdirs() AddedByConfigure(install) InstallManPage(dist,$(MANSRC)) Modified: trunk/dist/Makefile.SH =================================================================== --- trunk/dist/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-17] -: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] +: $X-Id: Jmake.tmpl 47 2010-11-28 22:23:13Z rmanfredi $ case $CONFIG in '') @@ -84,9 +84,11 @@ all:: -depend:: +depend:: sub_depend + +sub_depend:: @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ - for i in bin mcon pat jmake kit ;\ + for i in $(SUBDIRS) ;\ do \ (cd $$i ; echo "Depending" "in $(DIR)$$i..."; \ $(MAKE) $(MFLAGS) depend) || exit 1; \ @@ -173,6 +175,8 @@ local_clobber:: $(RM) tags +depend:: + ######################################################################## # Rules for building in sub-directories -- do not edit Modified: trunk/dist/bin/Jmakefile =================================================================== --- trunk/dist/bin/Jmakefile 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/bin/Jmakefile 2010-11-28 23:05:09 UTC (rev 48) @@ -30,7 +30,8 @@ !f.SH \ -expand \\ -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>[ ]*\([^ ]*\)/\2: \1/" \ Modified: trunk/dist/bin/Makefile.SH =================================================================== --- trunk/dist/bin/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/bin/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] -: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] +: $X-Id: Jmake.tmpl 47 2010-11-28 22:23:13Z rmanfredi $ case $CONFIG in '') @@ -58,7 +58,7 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ +# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $ ######################################################################## # Start of Jmakefile @@ -138,7 +138,8 @@ packinit.SH \ manilist.SH -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>[ ]*\([^ ]*\)/\2: \1/" \ @@ -206,6 +207,8 @@ local_clobber:: $(RM) tags +depend:: + ######################################################################## # Empty rules for directories with no sub-directories -- do not edit @@ -225,6 +228,13 @@ Makefiles.SH:: +######################################################################## +# Dependencies generated by make depend +# DO NOT DELETE THIS LINE -- make depend relies on it + +# Put nothing here or make depend will gobble it up +.FORCE_DEPEND:: + @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/jmake/Jmakefile =================================================================== --- trunk/dist/jmake/Jmakefile 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/jmake/Jmakefile 2010-11-28 23:05:09 UTC (rev 48) @@ -40,7 +40,8 @@ BINSH = jmake.SH fixcpp.SH -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>\([^ ]*\)/\2: \1/" \ Modified: trunk/dist/jmake/Makefile.SH =================================================================== --- trunk/dist/jmake/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/jmake/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) @@ -1,5 +1,5 @@ : Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] -: $X-Id: Jmake.tmpl 30 2009-10-28 07:45:28Z rmanfredi $ +: $X-Id: Jmake.tmpl 47 2010-11-28 22:23:13Z rmanfredi $ case $CONFIG in '') @@ -210,7 +210,8 @@ BINSH = jmake.SH fixcpp.SH -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>\([^ ]*\)/\2: \1/" \ @@ -280,6 +281,8 @@ local_clobber:: $(RM) tags +depend:: + ######################################################################## # Empty rules for directories with no sub-directories -- do not edit Modified: trunk/dist/jmake/files/Jmake.rules =================================================================== --- trunk/dist/jmake/files/Jmake.rules 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/jmake/files/Jmake.rules 2010-11-28 23:05:09 UTC (rev 48) @@ -554,7 +554,7 @@ * Generate rules to build the makedepend program. */ #define DependDependency() @!\ -depend:: TOPDIR/mkdep @!\ +local_depend:: TOPDIR/mkdep @!\ @!\ TOPDIR/mkdep: @!\ ?TOP: @echo "You have to run Configure first."; exit 1 @!\ @@ -571,7 +571,8 @@ |once _DependTarget_ @!\ DependDependency() @!\ @!\ -depend:: @@\ +depend:: local_depend @!\ +local_depend:: @@\ ($(SED) '/^# DO NOT DELETE/q' Makefile && \ @@\ $(MKDEP) $(SOURCES) | \ @@\ $(SED) -e 's:/usr/lib[^ ]*::g; s:$(USRINC)[^ ]*::g; ' \ @@\ @@ -1168,6 +1169,22 @@ /* + * NamedTargetSubdirsAsRule: + * Recursively make a series of steps in the specified directories, + * where the name of the local rule is different from the recursive + * actions. + */ +#define NamedTargetSubdirsAsRule(dirs,localname,name,verb,flags) @!\ +localname:: @@\ + @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ @@\ + for i in dirs ;\ @@\ + do \ @@\ + (cd $$i ; echo verb "in $(DIR)$$i..."; \ @@\ + $(MAKE) $(MFLAGS) flags name) || exit 1; \ @@\ + done + + +/* * NamedTargetSubdirs: * Recursively make a series of steps. */ @@ -1211,7 +1228,8 @@ * make depend step. */ #define DependDirs(dirs) \ -NamedTargetSubdirsRule(dirs,depend,"Depending",^^) +depend:: sub_depend @!\ +NamedTargetSubdirsAsRule(dirs,sub_depend,depend,"Depending",^^) /* Modified: trunk/dist/jmake/files/Jmake.tmpl =================================================================== --- trunk/dist/jmake/files/Jmake.tmpl 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/jmake/files/Jmake.tmpl 2010-11-28 23:05:09 UTC (rev 48) @@ -193,6 +193,11 @@ MakefileTarget() TagsTarget() +/* + * Empty rules in case there is no depend target. + */ +depend:: + %SUBDIRS:|skip /* Skip if no sub-directories */ ;######################################################################## ;# Rules for building in sub-directories -- do not edit @@ -240,8 +245,8 @@ Makefiles.SH:: --skip /* No sub-directories */ -%depend%:|skip /* Skip if no depend target */ +-skip /* No sub-directories */ +%local_depend%:|skip /* Skip if no local depend target */ ;######################################################################## ;# Dependencies generated by make depend ;# DO NOT DELETE THIS LINE -- make depend relies on it Modified: trunk/dist/kit/Jmakefile =================================================================== --- trunk/dist/kit/Jmakefile 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/kit/Jmakefile 2010-11-28 23:05:09 UTC (rev 48) @@ -34,7 +34,8 @@ !f.SH \ -expand \\ -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(SCRIPTSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>[ ]*\([^ ]*\)/\2: \1/" \ Modified: trunk/dist/kit/Makefile.SH =================================================================== --- trunk/dist/kit/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/kit/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] -: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] +: $X-Id: Jmake.tmpl 47 2010-11-28 22:23:13Z rmanfredi $ case $CONFIG in '') @@ -58,7 +58,7 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ +# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $ ######################################################################## # Start of Jmakefile @@ -163,7 +163,8 @@ kitsend.SH \ kitpost.SH -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(SCRIPTSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>[ ]*\([^ ]*\)/\2: \1/" \ @@ -231,6 +232,8 @@ local_clobber:: $(RM) tags +depend:: + ######################################################################## # Empty rules for directories with no sub-directories -- do not edit @@ -250,6 +253,13 @@ Makefiles.SH:: +######################################################################## +# Dependencies generated by make depend +# DO NOT DELETE THIS LINE -- make depend relies on it + +# Put nothing here or make depend will gobble it up +.FORCE_DEPEND:: + @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/lib/Makefile.SH =================================================================== --- trunk/dist/lib/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/lib/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] -: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] +: $X-Id: Jmake.tmpl 47 2010-11-28 22:23:13Z rmanfredi $ case $CONFIG in '') @@ -55,7 +55,7 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ +# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $ ######################################################################## # Start of Jmakefile @@ -181,6 +181,8 @@ local_clobber:: $(RM) tags +depend:: + ######################################################################## # Rules for building in sub-directories -- do not edit Modified: trunk/dist/mcon/Jmakefile =================================================================== --- trunk/dist/mcon/Jmakefile 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/mcon/Jmakefile 2010-11-28 23:05:09 UTC (rev 48) @@ -75,7 +75,8 @@ !f.SH \ -expand \\ -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>\([^ ]*\)/\2: \1/" \ Modified: trunk/dist/mcon/Makefile.SH =================================================================== --- trunk/dist/mcon/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/mcon/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) @@ -1,5 +1,5 @@ : Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] -: $X-Id: Jmake.tmpl 30 2009-10-28 07:45:28Z rmanfredi $ +: $X-Id: Jmake.tmpl 47 2010-11-28 22:23:13Z rmanfredi $ case $CONFIG in '') @@ -266,7 +266,8 @@ mlint.SH \ mxref.SH -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>\([^ ]*\)/\2: \1/" \ @@ -326,6 +327,8 @@ local_clobber:: $(RM) tags +depend:: + ######################################################################## # Rules for building in sub-directories -- do not edit Modified: trunk/dist/pat/Jmakefile =================================================================== --- trunk/dist/pat/Jmakefile 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/pat/Jmakefile 2010-11-28 23:05:09 UTC (rev 48) @@ -50,7 +50,8 @@ !f.SH \ -expand \\ -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(PATSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>\([^ ]*\)/\2: \1/" \ Modified: trunk/dist/pat/Makefile.SH =================================================================== --- trunk/dist/pat/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) +++ trunk/dist/pat/Makefile.SH 2010-11-28 23:05:09 UTC (rev 48) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] -: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] +: $X-Id: Jmake.tmpl 47 2010-11-28 22:23:13Z rmanfredi $ case $CONFIG in '') @@ -53,7 +53,7 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ +# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $ ######################################################################## # Start of Jmakefile @@ -194,7 +194,8 @@ patsnap.SH \ patlog.SH -depend:: +depend:: local_depend +local_depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(PATSH) | \ $(SED) -e "s/^.*' \([^ ]*\) >>\([^ ]*\)/\2: \1/" \ @@ -262,6 +263,8 @@ local_clobber:: $(RM) tags +depend:: + ######################################################################## # Empty rules for directories with no sub-directories -- do not edit @@ -281,6 +284,13 @@ Makefiles.SH:: +######################################################################## +# Dependencies generated by make depend +# DO NOT DELETE THIS LINE -- make depend relies on it + +# Put nothing here or make depend will gobble it up +.FORCE_DEPEND:: + @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 22:23:19
|
Revision: 47 http://dist.svn.sourceforge.net/dist/?rev=47&view=rev Author: rmanfredi Date: 2010-11-28 22:23:13 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Not all depend targets use $(MKDEP) so added a construct to check whether a target is being used. Protect the "DO NOT DELETE" line in the jmake template with a condition on the "depend" target being used. Modified Paths: -------------- trunk/dist/jmake/Makefile.SH trunk/dist/jmake/files/Jmake.tmpl trunk/dist/jmake/jmake.SH trunk/dist/jmake/jmake.man trunk/dist/mcon/Makefile.SH Modified: trunk/dist/jmake/Makefile.SH =================================================================== --- trunk/dist/jmake/Makefile.SH 2010-11-28 22:19:54 UTC (rev 46) +++ trunk/dist/jmake/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) @@ -299,6 +299,13 @@ Makefiles.SH:: +######################################################################## +# Dependencies generated by make depend +# DO NOT DELETE THIS LINE -- make depend relies on it + +# Put nothing here or make depend will gobble it up +.FORCE_DEPEND:: + @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/jmake/files/Jmake.tmpl =================================================================== --- trunk/dist/jmake/files/Jmake.tmpl 2010-11-28 22:19:54 UTC (rev 46) +++ trunk/dist/jmake/files/Jmake.tmpl 2010-11-28 22:23:13 UTC (rev 47) @@ -241,7 +241,7 @@ Makefiles.SH:: -skip /* No sub-directories */ -%MKDEP:|skip /* Skip if no depend target */ +%depend%:|skip /* Skip if no depend target */ ;######################################################################## ;# Dependencies generated by make depend ;# DO NOT DELETE THIS LINE -- make depend relies on it Modified: trunk/dist/jmake/jmake.SH =================================================================== --- trunk/dist/jmake/jmake.SH 2010-11-28 22:19:54 UTC (rev 46) +++ trunk/dist/jmake/jmake.SH 2010-11-28 22:23:13 UTC (rev 47) @@ -219,6 +219,8 @@ $GROK_START = "\$spitshell >>Makefile <<!GROK!THIS!\n"; $GROK_END = "!GROK!THIS!\n"; +%target = (); # Will record seen targets (actually generated) + open(MAKEFILE, ">Makefile.SH"); # We have to use for instead of foreach to handle 'skip' easily line: for ($i = 0; $i <= $#makefile; $i++) { @@ -309,6 +311,20 @@ s/<TAG>/[jmake $version-$revision]/; + # Lines starting with ?target?: (resp. %target%:) are to be processd + # only when target is used (resp. unused) in the generated makefile. + + # Apply in sequence + while (/^\s*\?|\s*%/) { + if (s/^\s*\?([\w-.]+)\?://) { # Wanted target ? + next line unless $target{$1}; + } elsif (s/^\s*%([\w-.]+)%://) { # Unwanted target ? + next line if $target{$1}; + } else { + last; + } + } + # Lines starting with ?SYMBOL: (resp. %SYMBOL:) are to be processed # only if SYMBOL is defined (resp. undefined). @@ -397,6 +413,11 @@ print MAKEFILE "$_\n"; } } else { + # Keep track of the targets we generate for ?target? and %target% type + # of tests in the templates, which can generate specific code when + # a target is indeed present. + $target{$1}++ if /^([\w.-]+):/; + &print_makefile($_); } } Modified: trunk/dist/jmake/jmake.man =================================================================== --- trunk/dist/jmake/jmake.man 2010-11-28 22:19:54 UTC (rev 46) +++ trunk/dist/jmake/jmake.man 2010-11-28 22:23:13 UTC (rev 47) @@ -152,6 +152,33 @@ .RE .sp .IP 3) +Makefile target tests: +.sp +.RS +.IP \(bu +?\fItarget\fR?:<text>: keeps <test> iff \fItarget\fR is defined. +.IP \(bu +%\fItarget\fR%:<text>: keeps <test> iff \fItarget\fR is not defined. +.sp +A makefile \fItarget\fR is defined as a standalone target, for instance +the +.B depend.local +target, which would be defined as: +.sp +.in +5 +.nf +depend.local: +.sp +.in -5 +.fi +Also note that it is only valid for targets defined +.I so far +in the generated makefile. It is not a predicate that can be used +to test for targets that will eventually be defined later on in the +generation. +.RE +.sp +.IP 4) Commands: .sp .RS @@ -217,9 +244,9 @@ .in -5 .sp Actually, this is ugly, because the text has to appear twice. -Fortunately, I did not use it. :-) +Fortunately, I did not use that construct. :-) .sp -But actually, as you have surely already guessed, the best way to +Indeed, as you have surely already guessed, the best way to implement a logical OR is to use De Morgan's Law: .sp .in +5 @@ -233,7 +260,7 @@ .sp .in -5 .fi -Who said they didn't care ? ;-) +Who said they didn't care about logic? ;-) .sp .PP Expansion is done with the \fIexpand\fR command. It has been provided to @@ -440,7 +467,7 @@ was run. .RE .sp -.IP 4) +.IP 5) Initializations: .sp .RS @@ -450,7 +477,7 @@ ++SYMBOL <value>: Adds <value> to the SYMBOL macro. .RE .sp -.IP 5) +.IP 6) User-defined variables: .sp The user may define CFLAGS, LDFLAGS or DPFLAGS as additional flags to be used Modified: trunk/dist/mcon/Makefile.SH =================================================================== --- trunk/dist/mcon/Makefile.SH 2010-11-28 22:19:54 UTC (rev 46) +++ trunk/dist/mcon/Makefile.SH 2010-11-28 22:23:13 UTC (rev 47) @@ -412,6 +412,13 @@ local_install.man:: local_deinstall.man:: +######################################################################## +# Dependencies generated by make depend +# DO NOT DELETE THIS LINE -- make depend relies on it + +# Put nothing here or make depend will gobble it up +.FORCE_DEPEND:: + @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 22:20:00
|
Revision: 46 http://dist.svn.sourceforge.net/dist/?rev=46&view=rev Author: rmanfredi Date: 2010-11-28 22:19:54 +0000 (Sun, 28 Nov 2010) Log Message: ----------- If we can't link against -lsocker, empty the socker flags. Modified Paths: -------------- trunk/dist/mcon/U/d_socker_get.U Modified: trunk/dist/mcon/U/d_socker_get.U =================================================================== --- trunk/dist/mcon/U/d_socker_get.U 2010-11-28 19:04:57 UTC (rev 45) +++ trunk/dist/mcon/U/d_socker_get.U 2010-11-28 22:19:54 UTC (rev 46) @@ -33,7 +33,7 @@ case "$d_socker_get" in "$undef") echo " "; echo "socker support is disabled." >&4;; *) -$cat >try.c <<'EOC' + $cat >try.c <<'EOC' #include <sys/types.h> #include <socker.h> int main(void) @@ -43,20 +43,23 @@ return ret ? 0 : 1; } EOC - -sockercflags=`socker-config --cflags 2>/dev/null` -sockerldflags=`socker-config --libs 2>/dev/null` - -saved_ccflags=$ccflags -saved_ldflags=$ldflags -ccflags="$ccflags $sockercflags" -ldflags="$ldflags $sockerldflags" -cyn="whether socket_get() allows binding to privileged ports" -set d_socker_get -eval $trylink - -ccflags=$saved_ccflags -ldflags=$saved_ldflags -;; + sockercflags=`socker-config --cflags 2>/dev/null` + sockerldflags=`socker-config --libs 2>/dev/null` + saved_ccflags=$ccflags + saved_ldflags=$ldflags + ccflags="$ccflags $sockercflags" + ldflags="$ldflags $sockerldflags" + cyn="whether socket_get() allows binding to privileged ports" + set d_socker_get + eval $trylink + ccflags=$saved_ccflags + ldflags=$saved_ldflags + case "$d_socker_get" in + "$undef") + sockercflags='' + sockerldflags='' + ;; + esac + ;; esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 19:05:03
|
Revision: 45 http://dist.svn.sourceforge.net/dist/?rev=45&view=rev Author: rmanfredi Date: 2010-11-28 19:04:57 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Regenerated. Modified Paths: -------------- trunk/dist/jmake/Makefile.SH trunk/dist/mcon/Makefile.SH Modified: trunk/dist/jmake/Makefile.SH =================================================================== --- trunk/dist/jmake/Makefile.SH 2010-11-28 19:03:51 UTC (rev 44) +++ trunk/dist/jmake/Makefile.SH 2010-11-28 19:04:57 UTC (rev 45) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] -: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] +: $X-Id: Jmake.tmpl 30 2009-10-28 07:45:28Z rmanfredi $ case $CONFIG in '') @@ -59,12 +59,12 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ +# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 3 2006-08-25 21:39:07Z rmanfredi $ +# $X-Id: Jmakefile 44 2010-11-28 19:03:51Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # @@ -219,6 +219,8 @@ cp Makefile.new Makefile $(RM) Makefile.new +fixcpp jmake: $(TOP)/revision.h + ######################################################################## # Common rules for all Makefiles -- do not edit Modified: trunk/dist/mcon/Makefile.SH =================================================================== --- trunk/dist/mcon/Makefile.SH 2010-11-28 19:03:51 UTC (rev 44) +++ trunk/dist/mcon/Makefile.SH 2010-11-28 19:04:57 UTC (rev 45) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] -: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-43] +: $X-Id: Jmake.tmpl 30 2009-10-28 07:45:28Z rmanfredi $ case $CONFIG in '') @@ -58,12 +58,12 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ +# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ +# $X-Id: Jmakefile 44 2010-11-28 19:03:51Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # @@ -275,6 +275,8 @@ cp Makefile.new Makefile $(RM) Makefile.new +mconfig mlint mxref: $(TOP)/revision.h + ######################################################################## # Common rules for all Makefiles -- do not edit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 19:03:58
|
Revision: 44 http://dist.svn.sourceforge.net/dist/?rev=44&view=rev Author: rmanfredi Date: 2010-11-28 19:03:51 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Add manual dependency on $(TOP)/revision.h since that cannot be automatically computed by the depend target. Modified Paths: -------------- trunk/dist/jmake/Jmakefile trunk/dist/mcon/Jmakefile Modified: trunk/dist/jmake/Jmakefile =================================================================== --- trunk/dist/jmake/Jmakefile 2010-11-28 18:22:20 UTC (rev 43) +++ trunk/dist/jmake/Jmakefile 2010-11-28 19:03:51 UTC (rev 44) @@ -49,3 +49,4 @@ cp Makefile.new Makefile $(RM) Makefile.new +fixcpp jmake: $(TOP)/revision.h Modified: trunk/dist/mcon/Jmakefile =================================================================== --- trunk/dist/mcon/Jmakefile 2010-11-28 18:22:20 UTC (rev 43) +++ trunk/dist/mcon/Jmakefile 2010-11-28 19:03:51 UTC (rev 44) @@ -84,3 +84,4 @@ cp Makefile.new Makefile $(RM) Makefile.new +mconfig mlint mxref: $(TOP)/revision.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 18:22:26
|
Revision: 43 http://dist.svn.sourceforge.net/dist/?rev=43&view=rev Author: rmanfredi Date: 2010-11-28 18:22:20 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Restored old code, commenting out the attempt to gather the include path by parsing cpp output. Modified Paths: -------------- trunk/dist/mcon/U/usrinc.U Modified: trunk/dist/mcon/U/usrinc.U =================================================================== --- trunk/dist/mcon/U/usrinc.U 2010-11-28 18:15:13 UTC (rev 42) +++ trunk/dist/mcon/U/usrinc.U 2010-11-28 18:22:20 UTC (rev 43) @@ -21,28 +21,30 @@ ?RCS: Revision 3.0 1993/08/18 12:09:58 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:usrinc: cat Getfile Guess Oldconfig cppstdin cppminus \ - fieldn grep sed awk tr +?MAKE:usrinc: Getfile Oldconfig incpath ?MAKE: -pick add $@ %< ?S:usrinc: ?S: This variable holds the path of the include files, which is ?S: usually /usr/include. It is mainly used by other Configure units. ?S:. ?D:usrinc='/usr/include' -?F:!usr.c : What should the include directory be ? echo " " dflt='/usr/include' case "$usrinc" in -'') - $cat >usr.c <<EOC - #include <stdio.h> -EOC - dflt=`$cppstdin $cppminus < usr.c 2>/dev/null | \ - $grep "^[ ]*#.*stdio.h" | $tr -d '"' | \ - $sed -ne "1s,\(.*\)[/\\]stdio.h.*,\1,p" | \ - $awk "{ print \\$$fieldn }"` - ;; +'') dflt="$incpath/usr/include";; +?X: This is nice, but it does not work on some systems because gcc redirects +?X: the include to things like ..../gcc45/gcc/4.5.2/include-fixed/stdio.h +?X: and it does not contain all the files. +?X: +?X: $cat >usr.c <<EOC +?X: #include <stdio.h> +?X:EOC +?X: dflt=`$cppstdin $cppminus < usr.c 2>/dev/null | \ +?X: $grep "^[ ]*#.*stdio.h" | $tr -d '"' | \ +?X: $sed -ne "1s,\(.*\)[/\\]stdio.h.*,\1,p" | \ +?X: $awk "{ print \\$$fieldn }"` +?X: ;; *) dflt="$usrinc";; esac fn=d/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 18:15:19
|
Revision: 42 http://dist.svn.sourceforge.net/dist/?rev=42&view=rev Author: rmanfredi Date: 2010-11-28 18:15:13 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Force extraction of the revision from $TOP/revision.h. Updated bin/svn-revision now that the format of the REVISION line changed. Modified Paths: -------------- trunk/dist/bin/svn-revision trunk/dist/jmake/fixcpp.SH trunk/dist/jmake/jmake.SH trunk/dist/mcon/mconfig.SH trunk/dist/mcon/mlint.SH trunk/dist/mcon/mxref.SH Modified: trunk/dist/bin/svn-revision =================================================================== --- trunk/dist/bin/svn-revision 2010-11-28 00:21:26 UTC (rev 41) +++ trunk/dist/bin/svn-revision 2010-11-28 18:15:13 UTC (rev 42) @@ -25,7 +25,7 @@ FILE="&1" oldrev='' else - oldrev=`grep REVISION "$FILE" 2>/dev/null | head -n1 | cut -d' ' -f3` + oldrev=`grep REVISION "$FILE" 2>/dev/null | head -n1 | cut -d' ' -f4` fi if test -d "$TOP/.svn"; then Modified: trunk/dist/jmake/fixcpp.SH =================================================================== --- trunk/dist/jmake/fixcpp.SH 2010-11-28 00:21:26 UTC (rev 41) +++ trunk/dist/jmake/fixcpp.SH 2010-11-28 18:15:13 UTC (rev 42) @@ -11,6 +11,7 @@ . $TOP/config.sh ;; esac +REVISION=`grep REVISION $TOP/revision.h | head -n1 | cut -d' ' -f4` case "$0" in */*) cd `expr X$0 : 'X\(.*\)/'` ;; esac Modified: trunk/dist/jmake/jmake.SH =================================================================== --- trunk/dist/jmake/jmake.SH 2010-11-28 00:21:26 UTC (rev 41) +++ trunk/dist/jmake/jmake.SH 2010-11-28 18:15:13 UTC (rev 42) @@ -11,6 +11,7 @@ . $TOP/config.sh ;; esac +REVISION=`grep REVISION $TOP/revision.h | head -n1 | cut -d' ' -f4` case "$0" in */*) cd `expr X$0 : 'X\(.*\)/'` ;; esac Modified: trunk/dist/mcon/mconfig.SH =================================================================== --- trunk/dist/mcon/mconfig.SH 2010-11-28 00:21:26 UTC (rev 41) +++ trunk/dist/mcon/mconfig.SH 2010-11-28 18:15:13 UTC (rev 42) @@ -11,6 +11,7 @@ . $TOP/config.sh ;; esac +REVISION=`grep REVISION $TOP/revision.h | head -n1 | cut -d' ' -f4` case "$0" in */*) cd `expr X$0 : 'X\(.*\)/'` ;; esac Modified: trunk/dist/mcon/mlint.SH =================================================================== --- trunk/dist/mcon/mlint.SH 2010-11-28 00:21:26 UTC (rev 41) +++ trunk/dist/mcon/mlint.SH 2010-11-28 18:15:13 UTC (rev 42) @@ -11,6 +11,7 @@ . $TOP/config.sh ;; esac +REVISION=`grep REVISION $TOP/revision.h | head -n1 | cut -d' ' -f4` case "$0" in */*) cd `expr X$0 : 'X\(.*\)/'` ;; esac Modified: trunk/dist/mcon/mxref.SH =================================================================== --- trunk/dist/mcon/mxref.SH 2010-11-28 00:21:26 UTC (rev 41) +++ trunk/dist/mcon/mxref.SH 2010-11-28 18:15:13 UTC (rev 42) @@ -11,6 +11,7 @@ . $TOP/config.sh ;; esac +REVISION=`grep REVISION $TOP/revision.h | head -n1 | cut -d' ' -f4` case "$0" in */*) cd `expr X$0 : 'X\(.*\)/'` ;; esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-28 00:21:33
|
Revision: 41 http://dist.svn.sourceforge.net/dist/?rev=41&view=rev Author: rmanfredi Date: 2010-11-28 00:21:26 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Moved computation of the filename position in cpp output from Findhdr.U to a standalone unit. Extracted MIPS system detection from usrinc.U to Mips.U. Compute default value for usrinc by parsing cpp output. Added WINDOWS_SYSTEM define for Windows. Random cleanup. Modified Paths: -------------- trunk/dist/MANIFEST trunk/dist/mcon/U/Alpha_mieee.U trunk/dist/mcon/U/Findhdr.U trunk/dist/mcon/U/GCC_pipe.U trunk/dist/mcon/U/Getfile.U trunk/dist/mcon/U/Guess.U trunk/dist/mcon/U/Head.U trunk/dist/mcon/U/Signal.U trunk/dist/mcon/U/d_iptos.U trunk/dist/mcon/U/libnlist.U trunk/dist/mcon/U/libpth.U trunk/dist/mcon/U/usrinc.U Added Paths: ----------- trunk/dist/mcon/U/Mips.U trunk/dist/mcon/U/fieldn.U Modified: trunk/dist/MANIFEST =================================================================== --- trunk/dist/MANIFEST 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/MANIFEST 2010-11-28 00:21:26 UTC (rev 41) @@ -108,6 +108,7 @@ mcon/U/Magic_h.U Makes confmagic.h--bizarrity here mcon/U/MailAuthor.U Offers user to register himself mcon/U/MailList.U Offers user to subscribe to users list +mcon/U/Mips.U Are we on a MIPS system? mcon/U/Mkdirp.U Unit producing shell script to "mkdir -p" mcon/U/Mksymlinks.U Unit to generate symlink to source tree mcon/U/Myinit.U For copying to private U directories @@ -431,6 +432,7 @@ mcon/U/enablenls.U Shall we enable NLS? mcon/U/errnolist.U See if we need our own .c to get sys_errnolist[] mcon/U/etc.U Where administrative executable should go +mcon/U/fieldn.U Compute included filename position in cpp output mcon/U/filexp.U Finds location of filexp made by Filexp.U mcon/U/floatsize.U What is the size of "float"? mcon/U/fpostype.U What is the type for file positions? Modified: trunk/dist/mcon/U/Alpha_mieee.U =================================================================== --- trunk/dist/mcon/U/Alpha_mieee.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/Alpha_mieee.U 2010-11-28 00:21:26 UTC (rev 41) @@ -14,7 +14,6 @@ ?LINT:change ccflags : check whether -mieee should be used flag='-mieee' -echo " " case "$gccversion" in '');; *) Modified: trunk/dist/mcon/U/Findhdr.U =================================================================== --- trunk/dist/mcon/U/Findhdr.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/Findhdr.U 2010-11-28 00:21:26 UTC (rev 41) @@ -27,64 +27,11 @@ ?X: and it returns the full path of the include file and a zero status or an ?X: empty string with an error status if the file could not be located. ?X: -?MAKE:Findhdr: grep test tr rm +usrinc awk cat startsh \ - cppstdin cppminus +cppflags eunicefix osname +?MAKE:Findhdr: grep tr rm +usrinc awk cat startsh \ + cppstdin cppminus +cppflags eunicefix fieldn cppfilter ?MAKE: -pick add $@ %< -?LINT:define fieldn -?S:fieldn: -?S: This variable is used internally by Configure. It contains the position -?S: of the included file name in cpp output. That is to say, when cpp -?S: pre-processes a #include <file> line, it replaces it by a # line which -?S: contains the original position in the input file and the full name of -?S: included file, between "quotes". -?S:. -?V:fieldn -?F:./findhdr !fieldn -?T:cline pos wanted name awkprg cppfilter testaccess status usrincdir -: determine filename position in cpp output -echo " " -echo "Computing filename position in cpp output for #include directives..." >&4 -echo '#include <stdio.h>' > foo.c -case "$osname" in -vos) - testaccess=-e -?X: VOS: path component separator is > - cppfilter="tr '\\\\>' '/' |" - ;; -*) - testaccess=-r - cppfilter='' - ;; -esac -$cat >fieldn <<EOF -$startsh -$cppstdin $cppflags $cppminus <foo.c 2>/dev/null | \ -$grep '^[ ]*#.*stdio\.h' | \ -while read cline; do - pos=1 - set \$cline - while $test \$# -gt 0; do - if $test $testaccess \`echo \$1 | $tr -d '"'\`; then - echo "\$pos" - exit 0 - fi - shift - pos=\`expr \$pos + 1\` - done -done -EOF -chmod +x fieldn -fieldn=`./fieldn` -$rm -f foo.c fieldn -case $fieldn in -'') pos='???';; -1) pos=first;; -2) pos=second;; -3) pos=third;; -*) pos="${fieldn}th";; -esac -echo "Your cpp writes the filename in the $pos field of the line." - +?F:./findhdr +?T:cline wanted name awkprg status usrincdir ?X: To locate a header file, we cannot simply check for $usrinc/file.h, since ?X: some machine have the headers in weird places and our only hope is that ?X: the C pre-processor will know how to find those headers. Thank you NexT! Modified: trunk/dist/mcon/U/GCC_pipe.U =================================================================== --- trunk/dist/mcon/U/GCC_pipe.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/GCC_pipe.U 2010-11-28 00:21:26 UTC (rev 41) @@ -14,7 +14,6 @@ ?LINT:change ccflags : check whether -pipe should be used flag='-pipe' -echo " " case "$gccversion" in '');; *) Modified: trunk/dist/mcon/U/Getfile.U =================================================================== --- trunk/dist/mcon/U/Getfile.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/Getfile.U 2010-11-28 00:21:26 UTC (rev 41) @@ -221,8 +221,9 @@ ?X: Always expand ~user if '/' was requested case "$ansexp" in /*) value="$ansexp" ;; -?X: Allow for c:/some/path +?X: Allow for c:/some/path and c:\some\path [a-zA-Z]:/*) value="$ansexp" ;; + [a-zA-Z]:\\*) value="$ansexp" ;; *) redo=true case "$already" in Modified: trunk/dist/mcon/U/Guess.U =================================================================== --- trunk/dist/mcon/U/Guess.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/Guess.U 2010-11-28 00:21:26 UTC (rev 41) @@ -34,8 +34,8 @@ ?X: is. The information it collects here is used primarily to establish default ?X: answers to other questions. ?X: -?MAKE:Guess d_eunice d_xenix d_bsd d_linux d_dos d_os2: cat test echo n c \ - contains rm tr Loc eunicefix +?MAKE:Guess d_eunice d_xenix d_bsd d_linux d_dos d_os2 d_windows: cat test \ + echo n c contains rm tr Loc eunicefix ?MAKE: -pick add $@ %< ?S:d_eunice: ?S: This variable conditionally defines the symbols EUNICE_SYSTEM, which @@ -61,6 +61,10 @@ ?S: This symbol conditionally defines the symbol LINUX_SYSTEM when running ?S: on a Linux system. ?S:. +?S:d_windows: +?S: This symbol conditionally defines the symbol WINDOWS_SYSTEM when running +?S: on a Windows system. +?S:. ?C:EUNICE_SYSTEM (EUNICE): ?C: This symbol, if defined, indicates that the program is being compiled ?C: under the EUNICE package under VMS. The program will need to handle @@ -92,6 +96,10 @@ ?C: This symbol, if defined, indicates that the program is running under ?C: a Linux system. ?C:. +?C:WINDOWS_SYSTEM: +?C: This symbol, if defined, indicates that the program is running under +?C: a Windows system. +?C:. ?H:#$d_eunice EUNICE_SYSTEM /**/ ?H:#$d_eunice VMS_SYSTEM /**/ ?H:#$d_xenix XENIX_SYSTEM /**/ @@ -99,8 +107,10 @@ ?H:#$d_os2 OS2_SYSTEM /**/ ?H:#$d_bsd BSD_SYSTEM /**/ ?H:#$d_linux LINUX_SYSTEM /**/ +?H:#$d_windows WINDOWS_SYSTEM /**/ ?H:. -?F:./bsd ./usg ./v7 ./osf1 ./eunice ./xenix ./venix ./dos ./os2 ./gnu ./linux +?F:./bsd ./usg ./v7 ./osf1 ./eunice ./xenix ./venix ./dos ./os2 ./gnu +?F:./windows ./linux ?T:xxx DJGPP MACHTYPE : make some quick guesses about what we are up against echo " " @@ -116,10 +126,12 @@ echo exit 1 >gnu echo exit 1 >linux echo exit 1 >dos +echo exit 1 >windows d_bsd="$undef" d_linux="$undef" d_dos="$undef" d_os2="$undef" +d_windows="$undef" ?X: ?X: Do not use 'usrinc', or we get a circular dependency. because ?X: usrinc is defined in usrinc.U, which relies on us... @@ -178,6 +190,18 @@ d_eunice="$undef" ;; esac +if test -d c:/.; then + case "X${MACHTYPE:-nonesuchmach}" in + *cygwin) echo " "; echo "Hah!... you're running under Cygwin!";; + *msys) echo " "; echo "Hah!... you're running under MinGW!";; + esac + case "X${MACHTYPE:-nonesuchmach}" in + *cygwin|*msys) + echo exit 0 >windows + d_windows="$define" + ;; + esac +fi case "$p_" in :) ;; *) @@ -185,10 +209,6 @@ I have the feeling something is not exactly right, however...don't tell me... EOI if test -n "$DJGPP"; then - case "X${MACHTYPE:-nonesuchmach}" in - cygwin) echo "hah!... you're running under Cygwin!";; - *) echo "got it... you're running DOS with DJGPP!";; - esac echo exit 0 >dos d_dos="$define" else @@ -222,7 +242,7 @@ echo "Nor is it Venix..." fi fi -chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux -$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux +chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux windows +$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux windows $rm -f foo Modified: trunk/dist/mcon/U/Head.U =================================================================== --- trunk/dist/mcon/U/Head.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/Head.U 2010-11-28 00:21:26 UTC (rev 41) @@ -139,7 +139,7 @@ OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'` elif test -n "$DJGPP"; then case "X${MACHTYPE:-nonesuchmach}" in - *cygwin) ;; + *cygwin|*msys) ;; *) p_=\; ;; esac fi Added: trunk/dist/mcon/U/Mips.U =================================================================== --- trunk/dist/mcon/U/Mips.U (rev 0) +++ trunk/dist/mcon/U/Mips.U 2010-11-28 00:21:26 UTC (rev 41) @@ -0,0 +1,69 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: usrinc.U,v $ +?RCS: Revision 3.0.1.3 1997/02/28 16:27:12 ram +?RCS: patch61: don't ask for the include path unless they are on a MIPS +?RCS: +?RCS: Revision 3.0.1.2 1995/05/12 12:24:36 ram +?RCS: patch54: ensure that ./mips always exists (ADO) +?RCS: +?RCS: Revision 3.0.1.1 1994/05/06 15:18:31 ram +?RCS: patch23: ensure usrinc value is preserved accross sessions (WED) +?RCS: +?RCS: Revision 3.0 1993/08/18 12:09:58 ram +?RCS: Baseline for dist 3.0 netwide release. +?RCS: +?MAKE:Mips mips_type incpath: test cat echo n c Getfile Guess \ + Oldconfig eunicefix contains rm +?MAKE: -pick add $@ %< +?S:mips_type: +?S: This variable holds the environment type for the mips system. +?S: Possible values are "BSD 4.3" and "System V". +?S:. +?S:incpath: +?S: This variable must preceed the normal include path to get hte +?S: right one, as in "$incpath/usr/include" or "$incpath/usr/lib". +?S: Value can be "" or "/bsd43" on mips. +?S:. +?F:./mips !usr.c +: What should the include directory be ? +echo " " +$echo $n "Hmm... $c" +incpath='' +?X: mips_type is used later, to add -DSYSTYPE_BSD43 to cppflags if needed. +mips_type='' +?X: +?X: Cannot put the following in Guess, or we get a circular dependency. +?X: +if $test -f /bin/mips && /bin/mips; then + echo "Looks like a MIPS system..." + $cat >usr.c <<'EOCP' +#ifdef SYSTYPE_BSD43 +/bsd43 +#endif +EOCP + if cc -E usr.c > usr.out && $contains / usr.out >/dev/null 2>&1; then + dflt='/bsd43/usr/include' + incpath='/bsd43' + mips_type='BSD 4.3' + else + mips_type='System V' + fi + $rm -f usr.c usr.out + echo "and you're compiling with the $mips_type compiler and libraries." + echo "exit 0" >mips +else + echo "Doesn't look like a MIPS system." + echo "exit 1" >mips +fi +chmod +x mips +$eunicefix mips + Property changes on: trunk/dist/mcon/U/Mips.U ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/dist/mcon/U/Signal.U =================================================================== --- trunk/dist/mcon/U/Signal.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/Signal.U 2010-11-28 00:21:26 UTC (rev 41) @@ -40,7 +40,7 @@ ?X: This unit is then used by sig_name.U. ?X: ?MAKE:Signal: test tr rm awk cat grep startsh eunicefix sed sort uniq \ - Findhdr cppstdin +cppflags cppminus Compile trnl run + Findhdr cppstdin +cppflags cppminus Compile trnl run fieldn ?MAKE: -pick add $@ %< ?X:all files declared as "public" since they're used from other units ?F:signal.c signal_cmd signal.lst signal signal.awk Modified: trunk/dist/mcon/U/d_iptos.U =================================================================== --- trunk/dist/mcon/U/d_iptos.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/d_iptos.U 2010-11-28 00:21:26 UTC (rev 41) @@ -45,7 +45,7 @@ YES #endif EOM -$cppstdin $cppflags $cppminus <iptos >iptos.h +$cppstdin $cppflags $cppminus <iptos >iptos.h 2>/dev/null val="$undef" if $contains 'YES' iptos.h >/dev/null 2>&1; then val="$define" @@ -59,7 +59,7 @@ YES #endif EOM - $cppstdin $cppflags $cppminus <iptos >iptos.h + $cppstdin $cppflags $cppminus <iptos >iptos.h 2>/dev/null if $contains 'YES' iptos.h >/dev/null 2>&1; then val="$define" echo "You have IP TOS support in <netinet/ip.h>." >&4 Added: trunk/dist/mcon/U/fieldn.U =================================================================== --- trunk/dist/mcon/U/fieldn.U (rev 0) +++ trunk/dist/mcon/U/fieldn.U 2010-11-28 00:21:26 UTC (rev 41) @@ -0,0 +1,82 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: Findhdr.U,v $ +?RCS: Revision 3.0.1.2 1994/10/29 15:53:08 ram +?RCS: patch36: added ?F: line for metalint file checking +?RCS: +?RCS: Revision 3.0.1.1 1994/05/06 14:03:56 ram +?RCS: patch23: cppminus must be after other cppflags, not before +?RCS: +?RCS: Revision 3.0 1993/08/18 12:04:54 ram +?RCS: Baseline for dist 3.0 netwide release. +?RCS: +?MAKE:fieldn cppfilter: grep test tr rm cat startsh \ + cppstdin cppminus osname +?MAKE: -pick add $@ %< +?S:fieldn: +?S: This variable is used internally by Configure. It contains the position +?S: of the included file name in cpp output. That is to say, when cpp +?S: pre-processes a #include <file> line, it replaces it by a # line which +?S: contains the original position in the input file and the full name of +?S: included file, between "quotes". +?S:. +?S:cppfilter: +?S: This variable is used internally by Configure. It either contains +?S: nothing or a shell piping stage to translate path components into "/". +?S: It is meant to be used as "... | $cppfilter $grep ..." i.e. without any +?S: explicit "|" character following it. +?S:. +?F:!fieldn +?T:pos testaccess cline +: determine filename position in cpp output +echo " " +echo "Computing filename position in cpp output for #include directives..." >&4 +echo '#include <stdio.h>' > foo.c +case "$osname" in +vos) + testaccess=-e +?X: VOS: path component separator is > + cppfilter="tr '\\\\>' '/' |" + ;; +*) + testaccess=-r + cppfilter='' + ;; +esac +$cat >fieldn <<EOF +$startsh +$cppstdin $cppminus <foo.c 2>/dev/null | \ +$grep '^[ ]*#.*stdio\.h' | \ +while read cline; do + pos=1 + set \$cline + while $test \$# -gt 0; do + if $test $testaccess \`echo \$1 | $tr -d '"'\`; then + echo "\$pos" + exit 0 + fi + shift + pos=\`expr \$pos + 1\` + done +done +EOF +chmod +x fieldn +fieldn=`./fieldn` +$rm -f foo.c fieldn +case $fieldn in +'') pos='???';; +1) pos=first;; +2) pos=second;; +3) pos=third;; +*) pos="${fieldn}th";; +esac +echo "Your cpp writes the filename in the $pos field of the line." + Property changes on: trunk/dist/mcon/U/fieldn.U ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/dist/mcon/U/libnlist.U =================================================================== --- trunk/dist/mcon/U/libnlist.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/libnlist.U 2010-11-28 00:21:26 UTC (rev 41) @@ -17,7 +17,7 @@ ?RCS: Revision 3.0 1993/08/18 12:09:00 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:libnlist: Loc libpth Guess usrinc _a +?MAKE:libnlist: Loc libpth Guess Mips usrinc _a ?MAKE: -pick add $@ %< ?S:libnlist (libmld): ?S: This variable contains the name of the library required to get the Modified: trunk/dist/mcon/U/libpth.U =================================================================== --- trunk/dist/mcon/U/libpth.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/libpth.U 2010-11-28 00:21:26 UTC (rev 41) @@ -35,7 +35,7 @@ ?X: This unit initializes the path for C library lookup. ?X: ?MAKE:libpth glibpth xlibpth plibpth loclibpth: \ - usrinc incpath test cat Myread Oldconfig + usrinc incpath test cat Myread Oldconfig Mips ?MAKE: -pick add $@ %< ?S:libpth: ?S: This variable holds the general path (space-separated) used to find Modified: trunk/dist/mcon/U/usrinc.U =================================================================== --- trunk/dist/mcon/U/usrinc.U 2010-11-27 20:54:48 UTC (rev 40) +++ trunk/dist/mcon/U/usrinc.U 2010-11-28 00:21:26 UTC (rev 41) @@ -21,73 +21,32 @@ ?RCS: Revision 3.0 1993/08/18 12:09:58 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:usrinc incpath mips_type: test cat echo n c Getfile Guess \ - Oldconfig eunicefix contains rm +?MAKE:usrinc: cat Getfile Guess Oldconfig cppstdin cppminus \ + fieldn grep sed awk tr ?MAKE: -pick add $@ %< ?S:usrinc: ?S: This variable holds the path of the include files, which is ?S: usually /usr/include. It is mainly used by other Configure units. ?S:. -?S:incpath: -?S: This variable must preceed the normal include path to get hte -?S: right one, as in "$incpath/usr/include" or "$incpath/usr/lib". -?S: Value can be "" or "/bsd43" on mips. -?S:. -?S:mips_type: -?S: This variable holds the environment type for the mips system. -?S: Possible values are "BSD 4.3" and "System V". -?S:. ?D:usrinc='/usr/include' -?LINT:create mips -?T:xxx_prompt -?F:./mips +?F:!usr.c : What should the include directory be ? echo " " -$echo $n "Hmm... $c" dflt='/usr/include' -incpath='' -?X: mips_type is used later, to add -DSYSTYPE_BSD43 to cppflags if needed. -mips_type='' -?X: -?X: Cannot put the following in Guess, or we get a circular dependency. -?X: -if $test -f /bin/mips && /bin/mips; then - echo "Looks like a MIPS system..." - $cat >usr.c <<'EOCP' -#ifdef SYSTYPE_BSD43 -/bsd43 -#endif -EOCP - if cc -E usr.c > usr.out && $contains / usr.out >/dev/null 2>&1; then - dflt='/bsd43/usr/include' - incpath='/bsd43' - mips_type='BSD 4.3' - else - mips_type='System V' - fi - $rm -f usr.c usr.out - echo "and you're compiling with the $mips_type compiler and libraries." - xxx_prompt=y - echo "exit 0" >mips -else - echo "Doesn't look like a MIPS system." - xxx_prompt=n - echo "exit 1" >mips -fi -chmod +x mips -$eunicefix mips case "$usrinc" in -'') ;; +'') + $cat >usr.c <<EOC + #include <stdio.h> +EOC + dflt=`$cppstdin $cppminus < usr.c 2>/dev/null | \ + $grep "^[ ]*#.*stdio.h" | $tr -d '"' | \ + $sed -ne "1s,\(.*\)[/\\]stdio.h.*,\1,p" | \ + $awk "{ print \\$$fieldn }"` + ;; *) dflt="$usrinc";; esac -case "$xxx_prompt" in -y) fn=d/ - echo " " - rp='Where are the include files you want to use?' - . ./getfile - usrinc="$ans" - ;; -*) usrinc="$dflt" - ;; -esac +fn=d/ +rp='Where are the include files you want to use?' +. ./getfile +usrinc="$ans" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-27 14:38:22
|
Revision: 39 http://dist.svn.sourceforge.net/dist/?rev=39&view=rev Author: rmanfredi Date: 2010-11-27 14:38:15 +0000 (Sat, 27 Nov 2010) Log Message: ----------- Restored the latest version of this unit, as used by gtk-gnutella. Modified Paths: -------------- trunk/dist/mcon/U/alignbytes.U Modified: trunk/dist/mcon/U/alignbytes.U =================================================================== --- trunk/dist/mcon/U/alignbytes.U 2010-11-27 14:33:11 UTC (rev 38) +++ trunk/dist/mcon/U/alignbytes.U 2010-11-27 14:38:15 UTC (rev 39) @@ -18,11 +18,11 @@ ?RCS: Revision 3.0 1993/08/18 12:05:23 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:alignbytes: Myread cat cc ccflags rm +?MAKE:alignbytes: Myread Trylink cat i_inttypes i_limits i_math ?MAKE: -pick add $@ %< ?S:alignbytes: -?S: This variable holds the number of bytes required to align a -?S: double. Usual values are 2, 4 and 8. +?S: This variable holds the number of bytes required to align an +?S: arbitrary standard type. Usual values are 2, 4 and 8. ?S:. ?X: This used to be called ALIGNBYTES, but that conflicts with ?X: <machines/param.h> in NetBSD. @@ -32,33 +32,111 @@ ?C:. ?H:#define MEM_ALIGNBYTES $alignbytes /**/ ?H:. -?F:!try +?T:alignment result : check for alignment requirements echo " " case "$alignbytes" in -'') echo "Checking alignment constraints..." >&4 - $cat >try.c <<'EOCP' -struct foobar { - char foo; - double bar; -} try; -int main() +'') + echo "Checking alignment constraints..." >&4 + + for alignment in 8 4 2 1 16 32 error + do + $cat >try.c <<EOCP +#$i_inttypes I_INTTYPES +#ifdef I_INTTYPES +#include <inttypes.h> +#endif +#$i_limits I_LIMITS +#ifdef I_LIMITS +#include <limits.h> +#endif +#$i_math I_MATH +#ifdef I_MATH +#include <math.h> +#endif + +union u { + void *void_ptr; + void (*func_ptr)(void); + char c; + short s; + int i; + long l; + float f; + double d; +#ifdef LLONG_MAX + long long ll; +#else +#warning "LLONG_MAX undefined" +#endif +#if defined(HUGE_VALL) + long double ld; +#else +#warning "HUGE_VALL undefined" +#endif +#ifdef UINT32_MAX + uint32_t u32; +#else +#warning "UINT32_MAX undefined" +#endif +#ifdef UINT16_MAX + uint16_t u16; +#else +#warning "UINT32_MAX undefined" +#endif +#ifdef UINT64_MAX + uint64_t u64; +#else +#warning "UINT64_MAX undefined" +#endif +#ifdef UINTMAX_MAX + uintmax_t m; +#else +#warning "UINTMAX_MAX undefined" +#endif +#ifdef UINTPTR_MAX + uintptr_t up; +#else +#warning "UINTPTR_MAX undefined" +#endif +}; + +struct s { + char a; + union u b; +}; + +#define STATIC_ASSERT(expr) \ + do { switch (0) { case ((expr) ? 1 : 0): case 0: break; } } while(0) + +int +main(void) { - printf("%d\n", (char *)&try.bar - (char *)&try.foo); + STATIC_ASSERT($alignment == ((sizeof (struct s) - (sizeof (union u))))); + return 0; } EOCP - if $cc $ccflags try.c -o try >/dev/null 2>&1; then - dflt=`./try` - else - dflt='8' - echo "(I can't seem to compile the test program...)" - fi - ;; + + result='' + set result + eval $trylink + case "$result" in + "$define") break;; + esac + done + + case "$alignment" in + error) dflt='8' + echo "(I can't seem to compile the test program...)" >&4 + ;; + *) dflt=$alignment + ;; + esac +;; *) dflt="$alignbytes" ;; esac -rp="Doubles must be aligned on a how-many-byte boundary?" +rp="What is the maximum alignment in bytes required for a standard type?" . ./myread alignbytes="$ans" -$rm -f try.c try This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-27 14:33:17
|
Revision: 38 http://dist.svn.sourceforge.net/dist/?rev=38&view=rev Author: rmanfredi Date: 2010-11-27 14:33:11 +0000 (Sat, 27 Nov 2010) Log Message: ----------- Use Trylink to see whether __attribute__ is supported. Modified Paths: -------------- trunk/dist/mcon/U/d_attribut.U Modified: trunk/dist/mcon/U/d_attribut.U =================================================================== --- trunk/dist/mcon/U/d_attribut.U 2010-11-27 14:28:11 UTC (rev 37) +++ trunk/dist/mcon/U/d_attribut.U 2010-11-27 14:33:11 UTC (rev 38) @@ -20,7 +20,7 @@ ?RCS: Revision 3.0.1.1 1994/10/29 16:08:55 ram ?RCS: patch36: created by ADO ?RCS: -?MAKE:d_attribut: Myread Oldconfig cat cc ccflags rm Setvar contains +?MAKE:d_attribut: Myread Oldconfig Trylink cat ?MAKE: -pick add $@ %< ?S:d_attribut (d_attrib): ?S: This variable conditionally defines HASATTRIBUTE, which @@ -42,23 +42,11 @@ : Look for GNU-cc style attribute checking echo " " echo "Checking whether your compiler can handle __attribute__ ..." >&4 -$cat >attrib.c <<'EOCP' +$cat >try.c <<'EOCP' #include <stdio.h> void croak (char* pat,...) __attribute__((format(printf,1,2),noreturn)); +int main(void) { return 0; } EOCP -if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then - if $contains 'warning' attrib.out >/dev/null 2>&1; then - echo "Your C compiler doesn't fully support __attribute__." - val="$undef" - else - echo "Your C compiler supports __attribute__." - val="$define" - fi -else - echo "Your C compiler doesn't seem to understand __attribute__ at all." - val="$undef" -fi set d_attribut -eval $setvar -$rm -f attrib* +eval $trylink This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-27 14:28:17
|
Revision: 37 http://dist.svn.sourceforge.net/dist/?rev=37&view=rev Author: rmanfredi Date: 2010-11-27 14:28:11 +0000 (Sat, 27 Nov 2010) Log Message: ----------- Fixed wrong usage of relative "revision.h" file. Modified Paths: -------------- trunk/dist/mcon/U/Oldsym.U Modified: trunk/dist/mcon/U/Oldsym.U =================================================================== --- trunk/dist/mcon/U/Oldsym.U 2010-11-27 14:13:04 UTC (rev 36) +++ trunk/dist/mcon/U/Oldsym.U 2010-11-27 14:28:11 UTC (rev 37) @@ -33,7 +33,7 @@ ?X: which is supposed to be expanded by the revision control system. $test -f $src/revision.h && \ sed -ne 's/^#define \([A-Za-z0-9_]*\) ".*: \([0-9]*\).*"/\1=\2/p' \ - < revision.h >>config.sh + < $src/revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-27 14:13:11
|
Revision: 36 http://dist.svn.sourceforge.net/dist/?rev=36&view=rev Author: rmanfredi Date: 2010-11-27 14:13:04 +0000 (Sat, 27 Nov 2010) Log Message: ----------- Regenerated Configure. File revision.h is now embedding "$Revision" so it is automatically updated but does not need to be checked-in because SVN won't see a difference worth submitting. Modified Paths: -------------- trunk/dist/Configure trunk/dist/bin/svn-revision trunk/dist/mcon/U/Oldsym.U trunk/dist/revision.h Modified: trunk/dist/Configure =================================================================== --- trunk/dist/Configure 2010-11-27 14:04:55 UTC (rev 35) +++ trunk/dist/Configure 2010-11-27 14:13:04 UTC (rev 36) @@ -16,9 +16,9 @@ # The dist package (which contains metaconfig) is available via SVN: # svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist -# $Id: Head.U 25 2008-05-28 11:19:25Z rmanfredi $ +# $Id: Head.U 35 2010-11-27 14:04:55Z rmanfredi $ # -# Generated on Wed May 28 13:22:26 CEST 2008 [metaconfig 3.5-25] +# Generated on Sat Nov 27 15:09:44 CET 2010 [metaconfig 3.5-34] cat >c1$$ <<EOF ARGGGHHHH!!!!! @@ -217,6 +217,7 @@ mkdir='' more='' mv='' +nawk='' nm='' nroff='' perl='' @@ -384,8 +385,7 @@ cc='cc' : Possible local include directories to search. : Set locincpth to "" in a hint file to defeat local include searches. -locincpth="/usr/local/include /opt/local/include /usr/gnu/include" -locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" +locincpth="" : : no include file wanted by default inclwanted='' @@ -393,8 +393,7 @@ : change the next line if compiling for Xenix/286 on Xenix/386 xlibpth='/usr/lib/386 /lib/386' : Possible local library directories to search. -loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" -loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" +loclibpth="" : general looking path for locating libraries glibpth="/lib /usr/lib $xlibpth" @@ -715,7 +714,7 @@ esac shift ;; - -V) echo "$me generated by metaconfig 3.5-25." >&2 + -V) echo "$me generated by metaconfig 3.5-34." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; @@ -1373,7 +1372,7 @@ zcat " pth=`echo $PATH | sed -e "s/$p_/ /g"` -pth="$pth /lib /usr/lib" +pth="$pth /sbin /usr/sbin /lib /usr/lib /etc" for file in $loclist; do eval xxx=\$$file case "$xxx" in @@ -1381,7 +1380,7 @@ if test -f "$xxx"; then : ok else - ./warn "no $xxx -- ignoring your setting for $file." + ./warn "no $xxx -- ignoring your setting for $file." 4>&4 xxx=`./loc $file $file $pth` fi ;; @@ -1414,7 +1413,7 @@ if test -f "$xxx"; then : ok else - ./warn "no $xxx -- ignoring your setting for $file." + ./warn "no $xxx -- ignoring your setting for $file." 4>&4 xxx=`./loc $file $file $pth` fi ;; @@ -1563,7 +1562,7 @@ [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no; $cat *.cbu >checktmp 2>/dev/null if $contains ccflags checktmp >/dev/null; then - ./warn <<EOM + ./warn 4>&4 <<EOM Any previous setting of the C compiler flags has been lost. It may be necessary to pass -Dcc=gcc to Configure right away. EOM @@ -3336,20 +3335,22 @@ echo " " echo "Checking for GNU cc in disguise and/or its version number..." >&4 $cat >try.c <<EOM -#include <stdio.h> -int main() { +int main(void) { #ifdef __GNUC__ -#ifdef __VERSION__ - printf("%s\n", __VERSION__); -#else - printf("%s\n", "1"); +gcc_version_major __GNUC__ +#ifdef __GNUC_MINOR__ +gcc_version_minor __GNUC__ #endif +#ifdef __GNUC_PATCHLEVEL__ +gcc_version_patchlevel __GNUC_PATCHLEVEL__ #endif - exit(0); +#endif } EOM -if $cc -o try $ccflags $ldflags try.c >/dev/null 2>&1; then - gccversion=`$run ./try` +if $cc -E try.c > try 2>&1 +then + gccversion=`$grep gcc_version_major try | + sed 's/^.*gcc_version_major[\t ]*//'` case "$gccversion" in '') echo "You are not using GNU cc." ;; *) echo "You are using GNU cc $gccversion." @@ -3357,15 +3358,7 @@ ;; esac else - echo " " - echo "*** WHOA THERE!!! ***" >&4 - echo " Your C compiler \"$cc\" doesn't seem to be working!" >&4 - case "$knowitall" in - '') - echo " You'd better start hunting for one and let me know about it." >&4 - exit 1 - ;; - esac + gccversion='' fi $rm -f try try.* case "$gccversion" in @@ -3713,7 +3706,7 @@ fi case "$hint" in -default|recommended) dflt="$ccflags $dflt" ;; +default|recommended) dflt="$dflt $ccflags" ;; *) dflt="$ccflags";; esac @@ -4484,6 +4477,7 @@ myuname='$myuname' n='$n' nametype='$nametype' +nawk='$nawk' nm='$nm' nroff='$nroff' optimize='$optimize' @@ -4554,7 +4548,8 @@ $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh $test -f $src/revision.h && \ -awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/revision.h >>config.sh +sed -ne 's/^#define \([A-Za-z0-9_]*\) ".*: \([0-9]*\).*"/\1=\2/p' \ + < revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols Modified: trunk/dist/bin/svn-revision =================================================================== --- trunk/dist/bin/svn-revision 2010-11-27 14:04:55 UTC (rev 35) +++ trunk/dist/bin/svn-revision 2010-11-27 14:13:04 UTC (rev 36) @@ -52,8 +52,9 @@ if [ "x$revnum" = x ]; then echo '/* Subversion information not available */' else + XRev='$Revision' cat <<EOF -#define REVISION $revnum +#define REVISION "$XRev: $revnum \$" EOF fi Modified: trunk/dist/mcon/U/Oldsym.U =================================================================== --- trunk/dist/mcon/U/Oldsym.U 2010-11-27 14:04:55 UTC (rev 35) +++ trunk/dist/mcon/U/Oldsym.U 2010-11-27 14:13:04 UTC (rev 36) @@ -28,8 +28,12 @@ : add special variables $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh +?X: In revision.h we expect something like: +?X: #define REVISION "$Revision$" +?X: which is supposed to be expanded by the revision control system. $test -f $src/revision.h && \ -awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/revision.h >>config.sh +sed -ne 's/^#define \([A-Za-z0-9_]*\) ".*: \([0-9]*\).*"/\1=\2/p' \ + < revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols Modified: trunk/dist/revision.h =================================================================== --- trunk/dist/revision.h 2010-11-27 14:04:55 UTC (rev 35) +++ trunk/dist/revision.h 2010-11-27 14:13:04 UTC (rev 36) @@ -4,4 +4,4 @@ * Generated by ./bin/svn-revision. */ -#define REVISION 33 +#define REVISION "$Revision$" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-27 14:05:02
|
Revision: 35 http://dist.svn.sourceforge.net/dist/?rev=35&view=rev Author: rmanfredi Date: 2010-11-27 14:04:55 +0000 (Sat, 27 Nov 2010) Log Message: ----------- Restored initial PATH settings removed by the mega patch. Modified Paths: -------------- trunk/dist/mcon/U/Head.U Modified: trunk/dist/mcon/U/Head.U =================================================================== --- trunk/dist/mcon/U/Head.U 2010-11-27 11:55:39 UTC (rev 34) +++ trunk/dist/mcon/U/Head.U 2010-11-27 14:04:55 UTC (rev 35) @@ -49,7 +49,7 @@ ?MAKE:Head: ?MAKE: -pick wipe $@ %< ?V:PATH p_ _exe me newsh -?T:argv Id OS2_SHELL DJGPP +?T:argv Id p paths OS2_SHELL DJGPP ?T:inksh needksh avoidksh newsh changesh reason ?F:!* ?LINT:extern ENV CDPATH SHELL MACHTYPE @@ -145,6 +145,44 @@ fi fi +?X: +?X: There are two schools of thoughts here. Some people correctly argue that +?X: the user has a better chance than we do of setting a reasonable PATH and +?X: others argue that Configure is the best place there is to set up a suitable +?X: PATH. Well, here we try to compromize by keeping the user's PATH and +?X: appending some directories which are known to work on some machine or the +?X: other. The rationale behind this being that a novice user might not have a +?X: proper environment variable set, and some directories like /etc (where +?X: chown is located on some BSD systems) may be missing--RAM. +?X: +?X: SVR4 adds an /opt directory for optional packages. Some sites use +?X: various permutations on /opt as opposed to /usr or /usr/local.-- ADO +?X: +?X: We only add directories that are not already in the PATH of the +?X: user and the directories must exist also. +?X: +: Proper PATH setting +paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /usr/ccs/bin" +paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +paths="$paths /sbin /usr/sbin /usr/libexec" +paths="$paths /system/gnu_library/bin" + +for p in $paths +do + case "$p_$PATH$p_" in + *$p_$p$p_*) ;; + *) test -d $p && PATH=$PATH$p_$p ;; + esac +done + +PATH=.$p_$PATH +export PATH + : shall we be using ksh? inksh='' needksh='' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-22 17:34:46
|
Revision: 33 http://dist.svn.sourceforge.net/dist/?rev=33&view=rev Author: rmanfredi Date: 2010-11-22 17:34:39 +0000 (Mon, 22 Nov 2010) Log Message: ----------- Taught metalint about "${var:" type syntax. Modified Paths: -------------- trunk/dist/mcon/pl/lint.pl Modified: trunk/dist/mcon/pl/lint.pl =================================================================== --- trunk/dist/mcon/pl/lint.pl 2010-11-22 17:33:04 UTC (rev 32) +++ trunk/dist/mcon/pl/lint.pl 2010-11-22 17:34:39 UTC (rev 33) @@ -778,10 +778,10 @@ } } } - # Now look at the shell variables used: can be $var or ${var} + # Now look at the shell variables used: can be $var or ${var} or ${var: local($var); local($line) = $_; - while ($check_vars && s/\$\{?(\w+)\}?/$1/) { + while ($check_vars && s/\$\{?(\w+)[\}:]?/$1/) { $var = $1; next if $var =~ /^\d+/; # Ignore $1 and friends # Record variable as undeclared but do not issue a message right now. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-11-22 17:33:11
|
Revision: 32 http://dist.svn.sourceforge.net/dist/?rev=32&view=rev Author: rmanfredi Date: 2010-11-22 17:33:04 +0000 (Mon, 22 Nov 2010) Log Message: ----------- Added lookup for nawk. Modified Paths: -------------- trunk/dist/mcon/U/Loc.U Modified: trunk/dist/mcon/U/Loc.U =================================================================== --- trunk/dist/mcon/U/Loc.U 2010-03-06 20:15:24 UTC (rev 31) +++ trunk/dist/mcon/U/Loc.U 2010-11-22 17:33:04 UTC (rev 32) @@ -64,14 +64,14 @@ ?MAKE:Loc awk ar bash bison byacc cat chgrp chmod chown \ comm compress cp cpio cpp csh date echo egrep emacs expr find flex \ gmake gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ - make mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ + make mkdir more mv nawk nm nroff perl pg pmake pr rm rmail sed sendmail \ shar sleep smail sort submit tail tar tbl tee test touch tr troff \ uname uniq uuname vi zcat zip: eunicefix n c startsh Instruct Warn ?MAKE: -pick weed $@ %< ?LINT: describe awk ar bash bison byacc cat chgrp chmod chown \ comm compress cp cpio cpp csh date echo egrep emacs expr find flex \ gmake gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ - make mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ + make mkdir more mv nawk nm nroff perl pg pmake pr rm rmail sed sendmail \ shar sleep smail sort submit tail tar tbl tee test touch tr troff \ uname uniq uuname vi zcat zip ?V::pth loclist trylist @@ -186,6 +186,7 @@ ?mailx:mailx ?make:make ?more:more +?nawk:nawk ?nm:nm ?nroff:nroff ?perl:perl @@ -211,7 +212,7 @@ ?LINT: set awk ar bash bison byacc cat chgrp chmod chown \ comm compress cp cpio cpp csh date echo emacs expr find flex \ gmake gzip grep inews ksh less line lint lp lpr ls mail mailx \ - mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ + mkdir more mv nawk nm nroff perl pg pmake pr rm rmail sed sendmail \ shar sleep smail sort submit tail tar tbl tee touch tr troff \ uname uniq uuname vi zcat zip pth=`echo $PATH | sed -e "s/$p_/ /g"` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2010-03-06 20:15:32
|
Revision: 31 http://dist.svn.sourceforge.net/dist/?rev=31&view=rev Author: rmanfredi Date: 2010-03-06 20:15:24 +0000 (Sat, 06 Mar 2010) Log Message: ----------- Fixed perl startup line since version 5.10 does not support "$*" any longer. Modified Paths: -------------- trunk/dist/bin/manilist.SH trunk/dist/bin/packinit.SH trunk/dist/jmake/bindex.SH trunk/dist/jmake/fixcpp.SH trunk/dist/jmake/jmake.SH trunk/dist/kit/kitpost.SH trunk/dist/kit/kitsend.SH trunk/dist/kit/makedist.SH trunk/dist/kit/manifake.SH trunk/dist/pat/pat.SH trunk/dist/pat/patbase.SH trunk/dist/pat/patcil.SH trunk/dist/pat/patclean.SH trunk/dist/pat/patcol.SH trunk/dist/pat/patdiff.SH trunk/dist/pat/patftp.SH trunk/dist/pat/patlog.SH trunk/dist/pat/patmake.SH trunk/dist/pat/patname.SH trunk/dist/pat/patnotify.SH trunk/dist/pat/patpost.SH trunk/dist/pat/patsend.SH trunk/dist/pat/patsnap.SH trunk/dist/revision.h Modified: trunk/dist/bin/manilist.SH =================================================================== --- trunk/dist/bin/manilist.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/bin/manilist.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting bin/manilist (with variable substitutions)" $spitshell >manilist <<!GROK!THIS! $startperl - eval 'exec perl -S \$0 "\$@"' + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/bin/packinit.SH =================================================================== --- trunk/dist/bin/packinit.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/bin/packinit.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting bin/packinit (with variable substitutions)" cat >packinit <<!GROK!THIS! # feed this into perl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/jmake/bindex.SH =================================================================== --- trunk/dist/jmake/bindex.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/jmake/bindex.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -19,7 +19,7 @@ $startperl !GROK!THIS! $spitshell >>bindex <<'!NO!SUBS!' - eval 'exec perl -S $0 "$@"' + eval 'exec perl -S $0 ${1+"$@"}' if $runnning_under_some_shell; # $Id$ Modified: trunk/dist/jmake/fixcpp.SH =================================================================== --- trunk/dist/jmake/fixcpp.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/jmake/fixcpp.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting jmake/fixcpp (with variable substitutions)" $spitshell >fixcpp <<!GROK!THIS! $startperl - eval 'exec perl -S \$0 "\$@"' + eval 'exec perl -S \$0 \${1+"\$@"}' if \$runnning_under_some_shell; # $Id$ Modified: trunk/dist/jmake/jmake.SH =================================================================== --- trunk/dist/jmake/jmake.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/jmake/jmake.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting jmake/jmake (with variable substitutions)" $spitshell >jmake <<!GROK!THIS! $startperl - eval 'exec perl -S \$0 "\$@"' + eval 'exec perl -S \$0 \${1+"\$@"}' if \$runnning_under_some_shell; # $Id$ Modified: trunk/dist/kit/kitpost.SH =================================================================== --- trunk/dist/kit/kitpost.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/kit/kitpost.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting kit/kitpost (with variable substitutions)" cat >kitpost <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/kit/kitsend.SH =================================================================== --- trunk/dist/kit/kitsend.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/kit/kitsend.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting kit/kitsend (with variable substitutions)" cat >kitsend <<!GROK!THIS! $startperl - eval 'exec perl -S \$0 "\$@"' + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/kit/makedist.SH =================================================================== --- trunk/dist/kit/makedist.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/kit/makedist.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -14,7 +14,7 @@ echo "Extracting kit/makedist (with variable substitutions)" cat >makedist <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/kit/manifake.SH =================================================================== --- trunk/dist/kit/manifake.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/kit/manifake.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting kit/manifake (with variable substitutions)" $spitshell >manifake <<!GROK!THIS! $startperl - eval "exec perl -i~ -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/pat.SH =================================================================== --- trunk/dist/pat/pat.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/pat.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/pat (with variable substitutions)" cat >pat <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patbase.SH =================================================================== --- trunk/dist/pat/patbase.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patbase.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patbase (with variable substitutions)" cat >patbase <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patcil.SH =================================================================== --- trunk/dist/pat/patcil.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patcil.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patcil (with variable substitutions)" $cat >patcil <<!GROK!THIS! $startperl - eval "exec perl -i~ -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patclean.SH =================================================================== --- trunk/dist/pat/patclean.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patclean.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patclean (with variable substitutions)" cat >patclean <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patcol.SH =================================================================== --- trunk/dist/pat/patcol.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patcol.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patcol (with variable substitutions)" cat >patcol <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patdiff.SH =================================================================== --- trunk/dist/pat/patdiff.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patdiff.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patdiff (with variable substitutions)" cat >patdiff <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patftp.SH =================================================================== --- trunk/dist/pat/patftp.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patftp.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patftp (with variable substitutions)" cat >patftp <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patlog.SH =================================================================== --- trunk/dist/pat/patlog.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patlog.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patlog (with variable substitutions)" cat >patlog <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patmake.SH =================================================================== --- trunk/dist/pat/patmake.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patmake.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patmake (with variable substitutions)" cat >patmake <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patname.SH =================================================================== --- trunk/dist/pat/patname.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patname.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patname (with variable substitutions)" cat >patname <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patnotify.SH =================================================================== --- trunk/dist/pat/patnotify.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patnotify.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patnotify (with variable substitutions)" cat >patnotify <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patpost.SH =================================================================== --- trunk/dist/pat/patpost.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patpost.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patpost (with variable substitutions)" cat >patpost <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patsend.SH =================================================================== --- trunk/dist/pat/patsend.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patsend.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patsend (with variable substitutions)" cat >patsend <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/pat/patsnap.SH =================================================================== --- trunk/dist/pat/patsnap.SH 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/pat/patsnap.SH 2010-03-06 20:15:24 UTC (rev 31) @@ -17,7 +17,7 @@ echo "Extracting pat/patsnap (with variable substitutions)" cat >patsnap <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/revision.h =================================================================== --- trunk/dist/revision.h 2009-10-28 07:45:28 UTC (rev 30) +++ trunk/dist/revision.h 2010-03-06 20:15:24 UTC (rev 31) @@ -4,4 +4,4 @@ * Generated by ./bin/svn-revision. */ -#define REVISION 25 +#define REVISION 30 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2009-10-28 07:45:38
|
Revision: 30 http://dist.svn.sourceforge.net/dist/?rev=30&view=rev Author: rmanfredi Date: 2009-10-28 07:45:28 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Make sure the "all" target is listed first in all the Makefiles we produce. That includes not specifying any "hidden" targets before "all". Modified Paths: -------------- trunk/dist/jmake/files/Jmake.tmpl Modified: trunk/dist/jmake/files/Jmake.tmpl =================================================================== --- trunk/dist/jmake/files/Jmake.tmpl 2008-06-16 18:11:00 UTC (rev 29) +++ trunk/dist/jmake/files/Jmake.tmpl 2009-10-28 07:45:28 UTC (rev 30) @@ -135,11 +135,15 @@ %MKDEP:|skip /* Skip if no depend target */ ;######################################################################## ;# Force 'make depend' to be performed first -- do not edit +/* + * The "all" target must appear first. Some "make" programs will otherwise + * default to the .FORCE_DEPEND target if it was listed first, despite it + * starting with a leading dot. + */ +all:: .FORCE_DEPEND .FORCE_DEPEND:: -all:: .FORCE_DEPEND - -skip /* Depend target */ ;######################################################################## ;# Start of Jmakefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cb...@us...> - 2008-06-16 18:11:02
|
Revision: 29 http://dist.svn.sourceforge.net/dist/?rev=29&view=rev Author: cbiere Date: 2008-06-16 11:11:00 -0700 (Mon, 16 Jun 2008) Log Message: ----------- * Append $ccflags so that it can override the defaults assuming the compiler picks the last choice as GCC does. Modified Paths: -------------- trunk/dist/mcon/U/ccflags.U Modified: trunk/dist/mcon/U/ccflags.U =================================================================== --- trunk/dist/mcon/U/ccflags.U 2008-06-16 18:04:21 UTC (rev 28) +++ trunk/dist/mcon/U/ccflags.U 2008-06-16 18:11:00 UTC (rev 29) @@ -197,7 +197,7 @@ fi case "$hint" in -default|recommended) dflt="$ccflags $dflt" ;; +default|recommended) dflt="$dflt $ccflags" ;; *) dflt="$ccflags";; esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cb...@us...> - 2008-06-16 18:04:27
|
Revision: 28 http://dist.svn.sourceforge.net/dist/?rev=28&view=rev Author: cbiere Date: 2008-06-16 11:04:21 -0700 (Mon, 16 Jun 2008) Log Message: ----------- * Use the preprocessor output to detect the GCC version instead of executing the compiled binary which is unsuitable for cross-compiling. Modified Paths: -------------- trunk/dist/mcon/U/gccvers.U Modified: trunk/dist/mcon/U/gccvers.U =================================================================== --- trunk/dist/mcon/U/gccvers.U 2008-06-14 20:50:12 UTC (rev 27) +++ trunk/dist/mcon/U/gccvers.U 2008-06-16 18:04:21 UTC (rev 28) @@ -11,7 +11,7 @@ ?RCS: Copyright (c) 2000, Jarkko Hietaniemi ?RCS: ?MAKE:gccversion gccosandvers: cat cpp rm +cc \ - Myread Guess Options Oldconfig Loc osname osvers grep run ccname + Myread Guess Options Oldconfig Loc osname osvers grep ccname ?MAKE: -pick add $@ %< ?S:gccversion: ?S: If GNU cc (gcc) is used, this variable holds '1' or '3' (for instance) @@ -31,20 +31,21 @@ echo " " echo "Checking for GNU cc in disguise and/or its version number..." >&4 $cat >try.c <<EOM -#include <stdio.h> -int main() { +int main(void) { #ifdef __GNUC__ -#ifdef __VERSION__ - printf("%s\n", __VERSION__); -#else - printf("%s\n", "1"); +gcc_version_major __GNUC__ +#ifdef __GNUC_MINOR__ +gcc_version_minor __GNUC__ #endif +#ifdef __GNUC_PATCHLEVEL__ +gcc_version_patchlevel __GNUC_PATCHLEVEL__ #endif - exit(0); +#endif } EOM -if $cc -o try $ccflags $ldflags try.c >/dev/null 2>&1; then - gccversion=`$run ./try` +if $cc -E try.c > try 2>&1 +then + gccversion=`sed -n 's/^gcc_version_major[^0-9]*//p' try` case "$gccversion" in '') echo "You are not using GNU cc." ;; *) echo "You are using GNU cc $gccversion." @@ -52,16 +53,7 @@ ;; esac else - echo " " - echo "*** WHOA THERE!!! ***" >&4 - echo " Your C compiler \"$cc\" doesn't seem to be working!" >&4 -?X: using -K will prevent aborting--maybe they're cross compiling? - case "$knowitall" in - '') - echo " You'd better start hunting for one and let me know about it." >&4 - exit 1 - ;; - esac + gccversion='' fi $rm -f try try.* case "$gccversion" in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2008-06-14 20:50:16
|
Revision: 27 http://dist.svn.sourceforge.net/dist/?rev=27&view=rev Author: rmanfredi Date: 2008-06-14 13:50:12 -0700 (Sat, 14 Jun 2008) Log Message: ----------- Make sure Instruct depends on Begin to move Begin ahead of any question asked by Configure. Modified Paths: -------------- trunk/dist/Configure trunk/dist/Makefile.SH trunk/dist/mcon/U/Instruct.U trunk/dist/revision.h Modified: trunk/dist/Configure =================================================================== --- trunk/dist/Configure 2008-06-14 20:48:34 UTC (rev 26) +++ trunk/dist/Configure 2008-06-14 20:50:12 UTC (rev 27) @@ -16,9 +16,9 @@ # The dist package (which contains metaconfig) is available via SVN: # svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist -# $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ +# $Id: Head.U 25 2008-05-28 11:19:25Z rmanfredi $ # -# Generated on Wed May 28 13:11:20 CEST 2008 [metaconfig 3.5-17] +# Generated on Wed May 28 13:22:26 CEST 2008 [metaconfig 3.5-25] cat >c1$$ <<EOF ARGGGHHHH!!!!! @@ -715,7 +715,7 @@ esac shift ;; - -V) echo "$me generated by metaconfig 3.5-17." >&2 + -V) echo "$me generated by metaconfig 3.5-25." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; Modified: trunk/dist/Makefile.SH =================================================================== --- trunk/dist/Makefile.SH 2008-06-14 20:48:34 UTC (rev 26) +++ trunk/dist/Makefile.SH 2008-06-14 20:50:12 UTC (rev 27) @@ -61,7 +61,7 @@ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ +# $X-Id: Jmakefile 25 2008-05-28 11:19:25Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi # Modified: trunk/dist/mcon/U/Instruct.U =================================================================== --- trunk/dist/mcon/U/Instruct.U 2008-06-14 20:48:34 UTC (rev 26) +++ trunk/dist/mcon/U/Instruct.U 2008-06-14 20:50:12 UTC (rev 27) @@ -27,7 +27,7 @@ ?X: isn't going to go shooting off the top of the screen, and we don't want ?X: to panic them yet. ?X: -?MAKE:Instruct: Myread Configdir contains +?MAKE:Instruct: Begin Myread Configdir contains ?MAKE: -pick wipe $@ %< ?T:user needman firsttime : general instructions Modified: trunk/dist/revision.h =================================================================== --- trunk/dist/revision.h 2008-06-14 20:48:34 UTC (rev 26) +++ trunk/dist/revision.h 2008-06-14 20:50:12 UTC (rev 27) @@ -1,7 +1,7 @@ /* - * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT ME + * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT * * Generated by ./bin/svn-revision. */ -#define REVISION 17 +#define REVISION 25 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2008-06-14 20:48:40
|
Revision: 26 http://dist.svn.sourceforge.net/dist/?rev=26&view=rev Author: rmanfredi Date: 2008-06-14 13:48:34 -0700 (Sat, 14 Jun 2008) Log Message: ----------- Panic if a routine is defined more than once. Modified Paths: -------------- trunk/dist/bin/perload Modified: trunk/dist/bin/perload =================================================================== --- trunk/dist/bin/perload 2008-05-28 11:19:25 UTC (rev 25) +++ trunk/dist/bin/perload 2008-06-14 20:48:34 UTC (rev 26) @@ -117,6 +117,8 @@ $fn_package = $current_package; $fn_basename = $function; } + die "line $.: duplicate routine ${fn_package}::$fn_basename\n" + if $Seen{"${fn_package}::$fn_basename"}++; # Keep leading function comment foreach (@Comment) { push(@Data, $_) unless $autoload; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2008-05-28 11:19:30
|
Revision: 25 http://dist.svn.sourceforge.net/dist/?rev=25&view=rev Author: rmanfredi Date: 2008-05-28 04:19:25 -0700 (Wed, 28 May 2008) Log Message: ----------- SVN revision number is now automatically generated in "revision.h". The old patchlevel information is no longer used, and <PATCHLEVEL> is deprecated in unit files, replaced by <REVISION>. Modified Paths: -------------- trunk/dist/Configure trunk/dist/Jmakefile trunk/dist/MANIFEST trunk/dist/Makefile.SH trunk/dist/jmake/fixcpp.SH trunk/dist/jmake/jmake.SH trunk/dist/mcon/U/Head.U trunk/dist/mcon/U/Oldsym.U trunk/dist/mcon/U/Options.U trunk/dist/mcon/U/patchlevel.U trunk/dist/mcon/man/mconfig.SH trunk/dist/mcon/mconfig.SH trunk/dist/mcon/mlint.SH trunk/dist/mcon/mxref.SH trunk/dist/mcon/pl/configure.pl trunk/dist/mcon/pl/lint.pl Modified: trunk/dist/Configure =================================================================== --- trunk/dist/Configure 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/Configure 2008-05-28 11:19:25 UTC (rev 25) @@ -18,7 +18,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Sat Aug 26 00:34:34 MEST 2006 [metaconfig 3.5 PL0] +# Generated on Wed May 28 13:11:20 CEST 2008 [metaconfig 3.5-17] cat >c1$$ <<EOF ARGGGHHHH!!!!! @@ -318,6 +318,7 @@ spackage='' pager='' patchlevel='' +revision='' perlpath='' pkgsrc='' prefix='' @@ -714,7 +715,7 @@ esac shift ;; - -V) echo "$me generated by metaconfig 3.5 PL0." >&2 + -V) echo "$me generated by metaconfig 3.5-17." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; @@ -1351,7 +1352,6 @@ uniq " trylist=" -Mcc cpp date inews @@ -3618,10 +3618,16 @@ : determine optimize, if desired, or use for debug flag also case "$optimize" in ' '|$undef) dflt='none';; -'') dflt='-O';; +'') + case "$gccversion" in + '') dflt='-O';; + *) dflt='-O2 -g';; + esac + ;; *) dflt="$optimize";; esac -$cat <<EOH +case "$gccversion" in +'') $cat <<EOH Some C compilers have problems with their optimizers. By default, $package compiles with the -O flag to use the optimizer. Alternately, you might want @@ -3630,6 +3636,17 @@ the word "none". EOH + ;; +*) $cat <<EOH + +With the GNU C compiler, it is possible to supply both -O2 and -g flags, to +be able to reasonably optimize, whilst retaining the ability to use a +symbolic debugger. Either flag can be specified here. To use neither flag, +specify the word "none". + +EOH + ;; +esac rp="What optimizer/debugger flag should be used?" . ./myread optimize="$ans" @@ -3655,7 +3672,7 @@ esac case "$gccversion" in 1*|2*) dflt="$dflt -Wall";; - *) dflt="$dflt -W -Wall -Wformat=2";; + *) dflt="$dflt -W -Wall -Wformat=2 -Wshadow";; esac ;; esac @@ -4191,9 +4208,9 @@ . ./getfile pager="$ans" -: get the patchlevel +: get the patchlevel / revision echo " " -echo "Getting the current patchlevel..." >&4 +echo "Getting the current patchlevel / revision..." >&4 if $test -r $rsrc/patchlevel.h;then patchlevel=`awk \ '/^#[ ]*define[ ][ ]*PATCHLEVEL/ {print $3}' \ @@ -4201,7 +4218,22 @@ else patchlevel=0 fi -echo "(You have $package $baserev PL$patchlevel.)" +if $test -r $rsrc/revision.h;then + revision=`awk \ + '/^#[ ]*define[ ][ ]*REVISION/ {print $3}' \ + < $rsrc/revision.h` +else + revision=0 +fi +case "$revision" in +0) echo "(You have $package $baserev PL$patchlevel.)" ;; +*) + case "$patchlevel" in + 0) echo "(You have $package $baserev-$revision)";; + *) echo "(You have $package $baserev-$revision PL$patchlevel)";; + esac + ;; +esac : determine perl absolute location case "$perlpath" in @@ -4474,6 +4506,7 @@ prefixexp='$prefixexp' privlib='$privlib' privlibexp='$privlibexp' +revision='$revision' rm='$rm' rmail='$rmail' run='$run' @@ -4520,6 +4553,8 @@ : add special variables $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh +$test -f $src/revision.h && \ +awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols Modified: trunk/dist/Jmakefile =================================================================== --- trunk/dist/Jmakefile 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/Jmakefile 2008-05-28 11:19:25 UTC (rev 25) @@ -31,3 +31,9 @@ InstallManPage(dist,$(MANSRC)) +all:: revision.h + +.FORCE: + +revision.h: .FORCE + $(TOP)/bin/svn-revision $(TOP) $@ Modified: trunk/dist/MANIFEST =================================================================== --- trunk/dist/MANIFEST 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/MANIFEST 2008-05-28 11:19:25 UTC (rev 25) @@ -18,6 +18,7 @@ bin/packinit.SH Creates a .package file describing your package bin/packinit.man Manual page for packinit bin/perload Build dynamically loaded perl scripts +bin/svn-revision Updates the top "revision.h" file if needed dist.man Introduction to dist install.SH Installation script with a BSD-like syntax jmake/ Where makefile generator is stored @@ -612,3 +613,4 @@ pl/snapshot.pl Perl library to parse RCS snapshot file pl/tilde.pl Perl library to perform ~name expansion pl/users.pl Perl library to parse users file +revision.h The current SVN revision number for dist Modified: trunk/dist/Makefile.SH =================================================================== --- trunk/dist/Makefile.SH 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/Makefile.SH 2008-05-28 11:19:25 UTC (rev 25) @@ -1,4 +1,4 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-17] : $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in @@ -56,7 +56,7 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ +# $X-Id: Jmake.rules 18 2006-12-27 10:35:09Z rmanfredi $ ######################################################################## # Start of Jmakefile @@ -104,6 +104,13 @@ local_deinstall.man:: $(RM) $(INSTALL_PREFIX)$(MANSRC)/dist.$(L) +all:: revision.h + +.FORCE: + +revision.h: .FORCE + $(TOP)/bin/svn-revision $(TOP) $@ + ######################################################################## # Common rules for all Makefiles -- do not edit Modified: trunk/dist/jmake/fixcpp.SH =================================================================== --- trunk/dist/jmake/fixcpp.SH 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/jmake/fixcpp.SH 2008-05-28 11:19:25 UTC (rev 25) @@ -55,6 +55,7 @@ \$cpp = '$cpp_trad'; \$version = '$VERSION'; \$patchlevel = '$PATCHLEVEL'; +\$revision = '$REVISION'; !GROK!THIS! $spitshell >>fixcpp <<'!NO!SUBS!' Modified: trunk/dist/jmake/jmake.SH =================================================================== --- trunk/dist/jmake/jmake.SH 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/jmake/jmake.SH 2008-05-28 11:19:25 UTC (rev 25) @@ -71,6 +71,7 @@ \$cpp = '$cpp'; \$version = '$VERSION'; \$patchlevel = '$PATCHLEVEL'; +\$revision = '$REVISION'; !GROK!THIS! $spitshell >>jmake <<'!NO!SUBS!' @@ -305,7 +306,7 @@ # Process regular line to be generated in Makefile.SH - s/<TAG>/[jmake $version PL$patchlevel]/; + s/<TAG>/[jmake $version-$revision]/; # Lines starting with ?SYMBOL: (resp. %SYMBOL:) are to be processed # only if SYMBOL is defined (resp. undefined). Modified: trunk/dist/mcon/U/Head.U =================================================================== --- trunk/dist/mcon/U/Head.U 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/U/Head.U 2008-05-28 11:19:25 UTC (rev 25) @@ -88,7 +88,7 @@ # $Id$ # -# Generated on <DATE> [metaconfig <VERSION> PL<PATCHLEVEL>] +# Generated on <DATE> [metaconfig <VERSION>-<REVISION>] cat >c1$$ <<EOF ARGGGHHHH!!!!! Modified: trunk/dist/mcon/U/Oldsym.U =================================================================== --- trunk/dist/mcon/U/Oldsym.U 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/U/Oldsym.U 2008-05-28 11:19:25 UTC (rev 25) @@ -28,6 +28,8 @@ : add special variables $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh +$test -f $src/revision.h && \ +awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols Modified: trunk/dist/mcon/U/Options.U =================================================================== --- trunk/dist/mcon/U/Options.U 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/U/Options.U 2008-05-28 11:19:25 UTC (rev 25) @@ -275,7 +275,7 @@ esac shift ;; - -V) echo "$me generated by metaconfig <VERSION> PL<PATCHLEVEL>." >&2 + -V) echo "$me generated by metaconfig <VERSION>-<REVISION>." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; Modified: trunk/dist/mcon/U/patchlevel.U =================================================================== --- trunk/dist/mcon/U/patchlevel.U 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/U/patchlevel.U 2008-05-28 11:19:25 UTC (rev 25) @@ -15,15 +15,20 @@ ?RCS: Revision 3.0 1993/08/18 12:09:31 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:patchlevel: package baserev test rsrc +?MAKE:patchlevel revision: package baserev test rsrc ?MAKE: -pick add $@ %< ?S:patchlevel: ?S: The patchlevel level of this package. ?S: The value of patchlevel comes from the patchlevel.h file. ?S:. -: get the patchlevel +?S:revision: +?S: The revision / build of this package. +?S: The value is derived from the REVISION define in the revision.h file. +?S: When revision is defined, the patch level should be ignored if 0. +?S:. +: get the patchlevel / revision echo " " -echo "Getting the current patchlevel..." >&4 +echo "Getting the current patchlevel / revision..." >&4 if $test -r $rsrc/patchlevel.h;then patchlevel=`awk \ '/^#[ ]*define[ ][ ]*PATCHLEVEL/ {print $3}' \ @@ -31,5 +36,20 @@ else patchlevel=0 fi -echo "(You have $package $baserev PL$patchlevel.)" +if $test -r $rsrc/revision.h;then + revision=`awk \ + '/^#[ ]*define[ ][ ]*REVISION/ {print $3}' \ + < $rsrc/revision.h` +else + revision=0 +fi +case "$revision" in +0) echo "(You have $package $baserev PL$patchlevel.)" ;; +*) + case "$patchlevel" in + 0) echo "(You have $package $baserev-$revision)";; + *) echo "(You have $package $baserev-$revision PL$patchlevel)";; + esac + ;; +esac Modified: trunk/dist/mcon/man/mconfig.SH =================================================================== --- trunk/dist/mcon/man/mconfig.SH 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/man/mconfig.SH 2008-05-28 11:19:25 UTC (rev 25) @@ -1455,8 +1455,12 @@ The name of the package, as derived from your \fI.package\fR file. .TP <PATCHLEVEL> -The patch level of the \fImetaconfig\fR program. +The patch level of the \fImetaconfig\fR program (deprecated in favor +of <REVISION>). .TP +<REVISION> +The SVN revision level of the \fImetaconfig\fR program. +.TP <VERSION> The version number of the \fImetaconfig\fR program. .PP Modified: trunk/dist/mcon/mconfig.SH =================================================================== --- trunk/dist/mcon/mconfig.SH 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/mconfig.SH 2008-05-28 11:19:25 UTC (rev 25) @@ -58,6 +58,7 @@ \$MC = '$privlib'; \$version = '$VERSION'; \$patchlevel = '$PATCHLEVEL'; +\$revision = '$REVISION'; \$grep = '$grep'; !GROK!THIS! @@ -78,7 +79,7 @@ ++$opt_M if -f 'confmagic.h'; # Force -M if confmagic.h already there if ($opt_V) { - print STDERR "metaconfig $version PL$patchlevel\n"; + print STDERR "metaconfig $version-$revision\n"; exit 0; } elsif ($opt_h) { &usage; Modified: trunk/dist/mcon/mlint.SH =================================================================== --- trunk/dist/mcon/mlint.SH 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/mlint.SH 2008-05-28 11:19:25 UTC (rev 25) @@ -51,6 +51,7 @@ \$MC = '$privlib'; \$version = '$VERSION'; \$patchlevel = '$PATCHLEVEL'; +\$revision = '$REVISION'; \$grep = '$grep'; !GROK!THIS! @@ -60,7 +61,7 @@ &usage unless &Getopts("hklVL:"); if ($opt_V) { - print STDERR "metalint $version PL$patchlevel\n"; + print STDERR "metalint $version-$revision\n"; exit 0; } elsif ($opt_h) { &usage; Modified: trunk/dist/mcon/mxref.SH =================================================================== --- trunk/dist/mcon/mxref.SH 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/mxref.SH 2008-05-28 11:19:25 UTC (rev 25) @@ -51,6 +51,7 @@ \$MC = '$privlib'; \$version = '$VERSION'; \$patchlevel = '$PATCHLEVEL'; +\$revision = '$REVISION'; \$grep = '$grep'; !GROK!THIS! @@ -68,7 +69,7 @@ chdir $WD || die "Can't chdir back to $WD: $!\n"; if ($opt_V) { - print STDERR "metaxref $version PL$patchlevel\n"; + print STDERR "metaxref $version-$revision\n"; exit 0; } elsif ($opt_h) { &usage; Modified: trunk/dist/mcon/pl/configure.pl =================================================================== --- trunk/dist/mcon/pl/configure.pl 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/pl/configure.pl 2008-05-28 11:19:25 UTC (rev 25) @@ -110,7 +110,9 @@ s/<PACKAGENAME>/$package/g; s/<MAINTLOC>/$maintloc/g; s/<VERSION>/$version/g; # This is metaconfig's version - s/<PATCHLEVEL>/$patchlevel/g; # And patchlevel information + s/<REVISION>/$revision/g; # And revision information + warn "\"$file\": usage of <PATCHLEVEL> is deprecated\n" + if s/<PATCHLEVEL>/$patchlevel/g; s/<DATE>/$date/g; s/<BASEREV>/$baserev/g; s/<\$(\w+)>/eval("\$$1")/ge; # <$var> -> $var substitution Modified: trunk/dist/mcon/pl/lint.pl =================================================================== --- trunk/dist/mcon/pl/lint.pl 2008-05-28 11:16:28 UTC (rev 24) +++ trunk/dist/mcon/pl/lint.pl 2008-05-28 11:19:25 UTC (rev 25) @@ -115,6 +115,7 @@ MAINTLOC VERSION PATCHLEVEL + REVISION DATE BASEREV ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2008-05-28 11:16:33
|
Revision: 24 http://dist.svn.sourceforge.net/dist/?rev=24&view=rev Author: rmanfredi Date: 2008-05-28 04:16:28 -0700 (Wed, 28 May 2008) Log Message: ----------- Added automatic SVN revision computation in "revision.h". Added Paths: ----------- trunk/dist/bin/svn-revision trunk/dist/revision.h Added: trunk/dist/bin/svn-revision =================================================================== --- trunk/dist/bin/svn-revision (rev 0) +++ trunk/dist/bin/svn-revision 2008-05-28 11:16:28 UTC (rev 24) @@ -0,0 +1,61 @@ +#!/bin/sh + +# +# $Id: svn-revision 12303 2006-11-11 08:11:46Z cbiere $ +# +# Copyright (c) 2006, Raphael Manfredi +# +# You may redistribute only under the terms of the Artistic Licence, +# as specified in the README file that comes with the distribution. +# You may reuse parts of this distribution only within the terms of +# that same Artistic Licence; a copy of which may be found at the root +# of the source tree for dist 4.0. +# +# Computes SVN current revision number, if possible, emitting it in +# the form of a #define for C perusal. +# + +LC_ALL=C +export LC_ALL + +TOP="$1" +FILE="$2" + +if [ "x$FILE" = x ]; then + FILE="&1" + oldrev='' +else + oldrev=`grep REVISION "$FILE" 2>/dev/null | head -n1 | cut -d' ' -f3` +fi + +if test -d "$TOP/.svn"; then + revnum=`svn info "$TOP" 2>/dev/null | grep '^Revision' | head -n1 | cut -d' ' -f2` +else + revnum="$oldrev" # keep as is +fi + +if [ "x$revnum" = "x$oldrev" ]; then + exit 0 +fi + +{ +stamp=`date +"%Y-%m-%d %H:%M:%d %z"` +cat <<EOF +/* + * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT + * + * Generated by $0. + */ + +EOF + +if [ "x$revnum" = x ]; then + echo '/* Subversion information not available */' +else + cat <<EOF +#define REVISION $revnum +EOF +fi + +} > "$FILE" + Property changes on: trunk/dist/bin/svn-revision ___________________________________________________________________ Name: svn:executable + * Added: trunk/dist/revision.h =================================================================== --- trunk/dist/revision.h (rev 0) +++ trunk/dist/revision.h 2008-05-28 11:16:28 UTC (rev 24) @@ -0,0 +1,7 @@ +/* + * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT ME + * + * Generated by ./bin/svn-revision. + */ + +#define REVISION 17 Property changes on: trunk/dist/revision.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |