From 28b19dcaac23ffe7975698bd1a9eaf07a84acc89 Mon Sep 17 00:00:00 2001 From: georges <> Date: Tue, 21 Nov 2000 01:33:34 +0000 Subject: [PATCH] *** empty log message *** --- pandatool/src/scripts/builder.pl | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pandatool/src/scripts/builder.pl b/pandatool/src/scripts/builder.pl index c7cf6303f5..6d8b7429bd 100755 --- a/pandatool/src/scripts/builder.pl +++ b/pandatool/src/scripts/builder.pl @@ -3,15 +3,16 @@ #NOTE: this script assumes you are running the Cygwin perl, which uses the # Cygwin file paths (i.e. '/' corresponds to 'C:\cygwin') -#$WIN_INSTALLDIR="\\\\nufat\\mass\\pandabuilds\\win"; +$WIN_INSTALLDIR="\\\\nufat\\mass\\pandabuilds\\win"; -$WIN_INSTALLDIR="\\\\cxgeorge-d01\\c\\pandabuilds\\win"; +#$WIN_INSTALLDIR="\\\\cxgeorge-d01\\c\\pandabuilds\\win"; -# $DEBUG_TREECOPY = 1; +#$DEBUG_TREECOPY = 1; # $DEBUG_GENERATE_PYTHON_CODE_ONLY = 1; $DONT_ARCHIVE_OLD_BUILDS = 0; + $BLD_DTOOL_ONLY=0; $DIRPATH_SEPARATOR=':'; # set to ';' for non-cygwin NT perl @@ -22,6 +23,8 @@ $ENV{'TCSH_NO_CSHRC_CHDIR'}='1'; $ENV{'HOME'}="/home/builder"; $ENV{'USER'}="builder"; $ENV{'USERNAME'}=$ENV{'USER'}; + + $DONT_ARCHIVE_OLD_BUILDS = (($ENV{'DONT_ARCHIVE_OLD_BUILDS'} ne "") || $DONT_ARCHIVE_OLD_BUILDS); sub logmsg() { @@ -216,7 +219,7 @@ sub gen_python_code() { $outputdir.= "\\Opt".$ENV{'PANDA_OPTIMIZE'}."-Win32"; &mymkdir($outputdir); - $genpyth_str.="generatePythonCode -v -d '".$outputdir."' -e '".$WINBLDROOT."\\direct\\src\\extensions' -i libdtool libpandaexpress libpanda libdirect"; + $genpyth_str.="generatePythonCode -v -d '".$outputdir."' -e '".$WINBLDROOT."\\direct\\src\\extensions' -i libdtool libpandaexpress libpanda libdirect libtoontown"; &myexecstr($genpyth_str,"generate python code failed!!!","DO_LOG","NO_PANDA_ATTACH"); @@ -267,7 +270,7 @@ sub buildall() { &mychdir($CYGBLDROOT); # get out of src dirs to allow them to be moved/renamed unlink($CYGBLDROOT."/dtool/dtool_config.h"); # fix freakish NTFS bug, this file is regenerated by ppremake anyway - &gen_python_code(); + &gen_python_code(); # must run AFTER toontown bld } # assumes environment already attached to TOOL/PANDA/DIRECT/TOONTOWN @@ -413,7 +416,7 @@ if(-e $CYGBLDROOT."/debug") { BEFORE_DBGBUILD: -&buildall("*** Starting Debug Build (Opt=1) at ".&gettimestr()." ***"); +&buildall("*** Starting Debug Build (Opt=".$ENV{'PANDA_OPTIMIZE'}.") at ".&gettimestr()." ***"); AFTER_DBGBUILD: @@ -437,7 +440,7 @@ foreach my $dir1 (@dirstodolist) { delete $ENV{'USE_BROWSEINFO'}; $ENV{'PANDA_OPTIMIZE'}='2'; -&buildall("*** Starting Install Build (Opt=2) at ".&gettimestr()." ***"); +&buildall("*** Starting Release Build (Opt=".$ENV{'PANDA_OPTIMIZE'}.") at ".&gettimestr()." ***"); # opt2 creates .sbr files when it should not #foreach my $dir1 (@dirstodolist) { @@ -448,8 +451,8 @@ $ENV{'PANDA_OPTIMIZE'}='2'; # &myexecstr("del /q /s *igate.cxx *.in ".$dirstodostr,"","DO_LOG","NT cmd"); #} -$ENV{'PANDA_OPTIMIZE'}='4'; -&buildall("*** Starting Release Build (Opt=4) at ".&gettimestr()." ***"); +$ENV{'PANDA_OPTIMIZE'}='3'; +&buildall("*** Starting Release Build (Opt=".$ENV{'PANDA_OPTIMIZE'}.") at ".&gettimestr()." ***"); # opt2 creates .sbr files when it should not #foreach my $dir1 (@dirstodolist) { @@ -546,6 +549,7 @@ exit(0); # TODO: # possibly auto delete or compress old archived blds # build DLLs with version stamp set by this script +# implement no-archive mode # implement build-specific opttype mode