mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-29 16:20:11 -04:00
*** empty log message ***
This commit is contained in:
parent
ef22ff8657
commit
117fa0038c
@ -22,7 +22,7 @@ sub CTAttachUsage {
|
|||||||
|
|
||||||
$tool = $ENV{"DTOOL"} ;
|
$tool = $ENV{"DTOOL"} ;
|
||||||
if ( $tool eq "" ) {
|
if ( $tool eq "" ) {
|
||||||
die "$DTOOL environment must be set to use CTtools\n" ;
|
die "\$" . "DTOOL environment must be set to use CTtools\n" ;
|
||||||
}
|
}
|
||||||
|
|
||||||
require "$tool/inc/ctattch.pl" ;
|
require "$tool/inc/ctattch.pl" ;
|
||||||
|
@ -171,26 +171,34 @@ sub CTAttachCompute {
|
|||||||
$spec = &CTResolveSpec( $_[0], $flav ) ;
|
$spec = &CTResolveSpec( $_[0], $flav ) ;
|
||||||
&CTUDebug( "spec line = '$spec'\n" ) ;
|
&CTUDebug( "spec line = '$spec'\n" ) ;
|
||||||
if ( $spec ne "" ) {
|
if ( $spec ne "" ) {
|
||||||
$root = &CTComputeRoot( $_[0], $flav, $spec ) ;
|
$root = &CTComputeRoot( $_[0], $flav, $spec ) ;
|
||||||
&CTCMSetup( $_[0], $spec, $flav ) ;
|
&CTCMSetup( $_[0], $spec, $flav ) ;
|
||||||
if ( -e $root ) {
|
if ( -e $root ) {
|
||||||
$done = 1 ;
|
$done = 1 ;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
print STDERR "could not resolve '" . $flav . "'\n" ;
|
||||||
|
$done = 1 ;
|
||||||
}
|
}
|
||||||
if (( ! $done ) && $_[2] ) {
|
if (( ! $done ) && $_[2] ) {
|
||||||
if ( $flav eq "install" ) {
|
if ( $flav eq "install" ) {
|
||||||
# oh my! are we ever in trouble
|
# oh my! are we ever in trouble
|
||||||
# want some sort of default, but couldn't get to what we wanted
|
# want some sort of default, but couldn't get to what we wanted
|
||||||
print STDERR "you are in a strange alien universe\n" ;
|
print STDERR "you are in a strange alien universe\n" ;
|
||||||
$spec = "" ;
|
$spec = "" ;
|
||||||
$done = 1 ;
|
$done = 1 ;
|
||||||
} elsif ( $flav eq "release" ) {
|
} elsif ( $flav eq "release" ) {
|
||||||
$flav = "install" ;
|
$flav = "install" ;
|
||||||
} elsif ( $flav eq "ship" ) {
|
} elsif ( $flav eq "ship" ) {
|
||||||
$flav = "release" ;
|
$flav = "release" ;
|
||||||
} else {
|
} else {
|
||||||
$flav = "ship" ;
|
$flav = "ship" ;
|
||||||
}
|
}
|
||||||
|
} elsif ( ! $done ) {
|
||||||
|
$spec = "" ;
|
||||||
|
print STDERR "resolved '" . $flav . "' but '" . $root .
|
||||||
|
"' does not exist\n" ;
|
||||||
|
$done = 1 ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -450,6 +458,9 @@ sub CTAttachWriteScript {
|
|||||||
print OUTFILE "\n" ;
|
print OUTFILE "\n" ;
|
||||||
} else {
|
} else {
|
||||||
print OUTFILE "setenv $item \"$outval\"\n" ;
|
print OUTFILE "setenv $item \"$outval\"\n" ;
|
||||||
|
if ( $ctdebug ) {
|
||||||
|
print OUTFILE "echo setting " . $item . " to '" . $outval . "'\n" ;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -457,14 +468,21 @@ sub CTAttachWriteScript {
|
|||||||
if ( $newenv{"CDPATH"} ne "" ) {
|
if ( $newenv{"CDPATH"} ne "" ) {
|
||||||
if ( $shell_type ne "sh" ) {
|
if ( $shell_type ne "sh" ) {
|
||||||
print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
||||||
|
if ( $ctdebug ) {
|
||||||
|
print OUTFILE "echo assigning cdpath\n" ;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach $item ( keys %envdo ) {
|
foreach $item ( keys %envdo ) {
|
||||||
print OUTFILE $envdo{$item} . "\n" ;
|
print OUTFILE $envdo{$item} . "\n" ;
|
||||||
|
if ( $ctdebug ) {
|
||||||
|
print OUTFILE "echo doing '" . $envdo{$item} . "'\n" ;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (! $ctdebug) {
|
if (! $ctdebug) {
|
||||||
print OUTFILE "rm -f $_[0]\n" ;
|
print OUTFILE "rm -f $_[0]\n" ;
|
||||||
} else {
|
} else {
|
||||||
|
print OUTFILE "echo end of script $_[0]\n" ;
|
||||||
print STDERR "no self-destruct script '" . $_[0] . "'\n" ;
|
print STDERR "no self-destruct script '" . $_[0] . "'\n" ;
|
||||||
}
|
}
|
||||||
close( OUTFILE ) ;
|
close( OUTFILE ) ;
|
||||||
|
@ -149,7 +149,7 @@ sub CTCcaseFormatComment {
|
|||||||
if ( $_[0] eq "" ) {
|
if ( $_[0] eq "" ) {
|
||||||
$ret = "-nc" ;
|
$ret = "-nc" ;
|
||||||
} else {
|
} else {
|
||||||
$ret = "-c " . $_[0] ;
|
$ret = "-c \"" . $_[0] . "\"" ;
|
||||||
}
|
}
|
||||||
$ret ;
|
$ret ;
|
||||||
}
|
}
|
||||||
|
@ -24,18 +24,33 @@ require "$tool/inc/ctproj.pl" ;
|
|||||||
require "$tool/inc/ctcm.pl" ;
|
require "$tool/inc/ctcm.pl" ;
|
||||||
|
|
||||||
$comment = "" ;
|
$comment = "" ;
|
||||||
if ( $ARGV[0] eq "-nc" ) {
|
|
||||||
shift( @ARGV ) ;
|
$skip = 0 ;
|
||||||
&CTUDebug( "-nc processed\n" ) ;
|
|
||||||
}
|
@files = () ;
|
||||||
if ( $ARGV[0] eq "-c" ) {
|
|
||||||
shift( @ARGV ) ;
|
foreach $item ( @ARGV ) {
|
||||||
$comment = $ARGV[0] ;
|
if ( $skip == 0 ) {
|
||||||
shift( @ARGV ) ;
|
if ( $item eq "-nc" ) {
|
||||||
&CTUDebug( "setting comment to '" . $comment . "'\n" ) ;
|
&CTUDebug( "-nc processed\n" ) ;
|
||||||
|
} elsif ( $item eq "-c" ) {
|
||||||
|
$skip = 1 ;
|
||||||
|
} else {
|
||||||
|
push( @files, $item ) ;
|
||||||
|
&CTUDebug( "added '" . $item . "' to files to be processed\n" ) ;
|
||||||
|
}
|
||||||
|
} elsif ( $skip == 1 ) {
|
||||||
|
$comment = $item ;
|
||||||
|
&CTUDebug( "setting comment to '" . $comment . "'\n" ) ;
|
||||||
|
$skip = 0 ;
|
||||||
|
} else {
|
||||||
|
&CTUDebug( "got to unknown skip value! (" . $skip . ")\n" ) ;
|
||||||
|
$skip = 0 ;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $#ARGV < 0 ) {
|
|
||||||
|
if ($#files < 0 ) {
|
||||||
&CTCiUsage ;
|
&CTCiUsage ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -44,7 +59,7 @@ $projname =~ tr/A-Z/a-z/ ;
|
|||||||
$flav = &CTQueryProj( $projname ) ;
|
$flav = &CTQueryProj( $projname ) ;
|
||||||
$spec = &CTResolveSpec( $projname, $flav ) ;
|
$spec = &CTResolveSpec( $projname, $flav ) ;
|
||||||
|
|
||||||
foreach $item ( @ARGV ) {
|
foreach $item ( @files ) {
|
||||||
if ( -e $item ) {
|
if ( -e $item ) {
|
||||||
if ( ! &CTCMCheckin( $item, $projname, $spec, $comment ) ) {
|
if ( ! &CTCMCheckin( $item, $projname, $spec, $comment ) ) {
|
||||||
print STDERR "Could not checkin '$item'\n" ;
|
print STDERR "Could not checkin '$item'\n" ;
|
||||||
|
@ -26,7 +26,6 @@ sub CTCMSetup {
|
|||||||
print STDERR "CVS login failed given server line '" . $serve .
|
print STDERR "CVS login failed given server line '" . $serve .
|
||||||
"'\n" ;
|
"'\n" ;
|
||||||
}
|
}
|
||||||
print STDERR "I don't know how to setup CVS stuff yet!!\n" ;
|
|
||||||
}
|
}
|
||||||
# no other types have any work that needs to be done at this time
|
# no other types have any work that needs to be done at this time
|
||||||
}
|
}
|
||||||
|
@ -24,18 +24,32 @@ require "$tool/inc/ctproj.pl" ;
|
|||||||
require "$tool/inc/ctcm.pl" ;
|
require "$tool/inc/ctcm.pl" ;
|
||||||
|
|
||||||
$comment = "" ;
|
$comment = "" ;
|
||||||
if ( $ARGV[0] eq "-nc" ) {
|
|
||||||
shift( @ARGV ) ;
|
$skip = 0 ;
|
||||||
&CTUDebug( "-nc processed\n" ) ;
|
|
||||||
}
|
@files = () ;
|
||||||
if ( $ARGV[0] eq "-c" ) {
|
|
||||||
shift( @ARGV ) ;
|
foreach $item ( @ARGV ) {
|
||||||
$comment = $ARGV[0] ;
|
if ( $skip == 0 ) {
|
||||||
shift( @ARGV ) ;
|
if ( $item eq "-nc" ) {
|
||||||
&CTUDebug( "setting comment to '" . $comment . "'\n" ) ;
|
&CTUDebug( "-nc processed\n" ) ;
|
||||||
|
} elsif ( $item eq "-c" ) {
|
||||||
|
$skip = 1 ;
|
||||||
|
} else {
|
||||||
|
push( @files, $item ) ;
|
||||||
|
&CTUDebug( "added '" . $item . "' to files to be processed\n" ) ;
|
||||||
|
}
|
||||||
|
} elsif ( $skip == 1 ) {
|
||||||
|
$comment = $item ;
|
||||||
|
&CTUDebug( "setting comment to '" . $comment . "'\n" ) ;
|
||||||
|
$skip = 0 ;
|
||||||
|
} else {
|
||||||
|
&CTUDebug( "got to unknown skip value! (" . $skip . ")\n" ) ;
|
||||||
|
$skip = 0 ;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $#ARGV < 0 ) {
|
if ( $#files < 0 ) {
|
||||||
&CTCoUsage ;
|
&CTCoUsage ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -44,7 +58,7 @@ $projname =~ tr/A-Z/a-z/ ;
|
|||||||
$flav = &CTQueryProj( $projname ) ;
|
$flav = &CTQueryProj( $projname ) ;
|
||||||
$spec = &CTResolveSpec( $projname, $flav ) ;
|
$spec = &CTResolveSpec( $projname, $flav ) ;
|
||||||
|
|
||||||
foreach $item ( @ARGV ) {
|
foreach $item ( @files ) {
|
||||||
if ( -e $item ) {
|
if ( -e $item ) {
|
||||||
if ( ! &CTCMCheckout( $item, $projname, $spec, $comment ) ) {
|
if ( ! &CTCMCheckout( $item, $projname, $spec, $comment ) ) {
|
||||||
print STDERR "Could not checkout '$item'\n" ;
|
print STDERR "Could not checkout '$item'\n" ;
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
sub CTCvsFormatComment {
|
sub CTCvsFormatComment {
|
||||||
local( $ret ) = "" ;
|
local( $ret ) = "" ;
|
||||||
if ( $_[0] ne "" ) {
|
if ( $_[0] ne "" ) {
|
||||||
$ret = "-m " . $_[0] ;
|
$ret = "-m \"" . $_[0] . "\"" ;
|
||||||
}
|
}
|
||||||
$ret ;
|
$ret ;
|
||||||
}
|
}
|
||||||
|
@ -15,12 +15,37 @@ require "$tool/inc/ctquery.pl" ;
|
|||||||
require "$tool/inc/ctproj.pl" ;
|
require "$tool/inc/ctproj.pl" ;
|
||||||
require "$tool/inc/ctcm.pl" ;
|
require "$tool/inc/ctcm.pl" ;
|
||||||
|
|
||||||
|
$comment = "" ;
|
||||||
|
$skip = 0 ;
|
||||||
|
|
||||||
|
@files = () ;
|
||||||
|
|
||||||
|
foreach $item ( @ARGV ) {
|
||||||
|
if ( $skip == 0 ) {
|
||||||
|
if ( $item eq "-nc" ) {
|
||||||
|
&CTUDebug( "-nc processed\n" ) ;
|
||||||
|
} elsif ( $item eq "-c" ) {
|
||||||
|
$skip = 1 ;
|
||||||
|
} else {
|
||||||
|
push( @files, $item ) ;
|
||||||
|
&CTUDebug( "added '" . $item . "' to files to be processed\n" ) ;
|
||||||
|
}
|
||||||
|
} elsif ( $skip == 1 ) {
|
||||||
|
$comment = $item ;
|
||||||
|
&CTUDebug( "setting comment to '" . $comment . "'\n" ) ;
|
||||||
|
$skip = 0 ;
|
||||||
|
} else {
|
||||||
|
&CTUDebug( "got to unknown skip value! (" . $skip . ")\n" ) ;
|
||||||
|
$skip = 0 ;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$projname = &CTProj ;
|
$projname = &CTProj ;
|
||||||
$projname =~ tr/A-Z/a-z/ ;
|
$projname =~ tr/A-Z/a-z/ ;
|
||||||
$flav = &CTQueryProj( $projname ) ;
|
$flav = &CTQueryProj( $projname ) ;
|
||||||
$spec = &CTResolveSpec( $projname, $flav ) ;
|
$spec = &CTResolveSpec( $projname, $flav ) ;
|
||||||
|
|
||||||
foreach $item ( @ARGV ) {
|
foreach $item ( @files ) {
|
||||||
if ( -e $item ) {
|
if ( -e $item ) {
|
||||||
&CTCMCheckin( $item, $projname, $spec ) ;
|
&CTCMCheckin( $item, $projname, $spec ) ;
|
||||||
if ( ! &CTCMDelta( $item, $projname, $spec ) ) {
|
if ( ! &CTCMDelta( $item, $projname, $spec ) ) {
|
||||||
|
@ -9,7 +9,7 @@ sub CTNtoolFormatComment {
|
|||||||
if ( $_[0] eq "" ) {
|
if ( $_[0] eq "" ) {
|
||||||
$ret = "-nc" ;
|
$ret = "-nc" ;
|
||||||
} else {
|
} else {
|
||||||
$ret = "-c " . $_[0] ;
|
$ret = "-c \"" . $_[0] . "\"" ;
|
||||||
}
|
}
|
||||||
$ret ;
|
$ret ;
|
||||||
}
|
}
|
||||||
|
@ -62,13 +62,6 @@ if ( ! $?CTEMACS_OPTS ) setenv CTEMACS_OPTS ""
|
|||||||
if ( -e /usr/atria/bin ) set path = ( /usr/atria/bin $path )
|
if ( -e /usr/atria/bin ) set path = ( /usr/atria/bin $path )
|
||||||
rehash
|
rehash
|
||||||
|
|
||||||
if ( ! $?DTOOL ) setenv DTOOL /beta/player/bootstrap/dtool
|
|
||||||
if ( $#argv == 0 ) then
|
|
||||||
source `$DTOOL/bin/ctattach.drv dtool default`
|
|
||||||
else
|
|
||||||
source `$DTOOL/bin/ctattach.drv dtool $argv[1]`
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ( ! $?PENV ) then
|
if ( ! $?PENV ) then
|
||||||
if ( $OS == "Linux" ) then
|
if ( $OS == "Linux" ) then
|
||||||
setenv PENV "Linux"
|
setenv PENV "Linux"
|
||||||
@ -81,5 +74,12 @@ if ( ! $?PENV ) then
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if ( ! $?DTOOL ) setenv DTOOL /beta/player/bootstrap/dtool
|
||||||
|
if ( $#argv == 0 ) then
|
||||||
|
source `$DTOOL/bin/ctattach.drv dtool default`
|
||||||
|
else
|
||||||
|
source `$DTOOL/bin/ctattach.drv dtool $argv[1]`
|
||||||
|
endif
|
||||||
|
|
||||||
setenv CTEMACS_FOREHIGHLIGHT white
|
setenv CTEMACS_FOREHIGHLIGHT white
|
||||||
setenv CTEMACS_BACKHIGHLIGHT blue
|
setenv CTEMACS_BACKHIGHLIGHT blue
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
MODREL ETC_PATH etc
|
MODREL ETC_PATH etc
|
||||||
|
SEP PYTHONPATH :
|
||||||
|
MODREL PYTHONPATH lib
|
||||||
DOCSH source $DTOOL/etc/dtool.alias
|
DOCSH source $DTOOL/etc/dtool.alias
|
||||||
DOCSH unsetenv LASTLOGIN
|
DOCSH unsetenv LASTLOGIN
|
||||||
DOCSH setenv OS_VER `uname -r`
|
DOCSH setenv OS_VER `uname -r`
|
||||||
|
@ -59,12 +59,6 @@ if [ -z "$DTOOL" ]; then
|
|||||||
export DTOOL
|
export DTOOL
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$1" ]; then
|
|
||||||
source `$DTOOL/bin/ctattach.drv dtool default`
|
|
||||||
else
|
|
||||||
source `$DTOOL/bin/ctattach.drv dtool $1`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$PENV" ]; then
|
if [ -z "$PENV" ]; then
|
||||||
if [ $OS = "Linux" ]; then
|
if [ $OS = "Linux" ]; then
|
||||||
PENV="Linux"
|
PENV="Linux"
|
||||||
@ -77,3 +71,9 @@ if [ -z "$PENV" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
export PENV
|
export PENV
|
||||||
|
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
source `$DTOOL/bin/ctattach.drv dtool default`
|
||||||
|
else
|
||||||
|
source `$DTOOL/bin/ctattach.drv dtool $1`
|
||||||
|
fi
|
||||||
|
@ -80,7 +80,7 @@ while ( @arglist != () ) {
|
|||||||
&CTInstallScanMake( "$curdir/Makefile" ) ;
|
&CTInstallScanMake( "$curdir/Makefile" ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
$item = "$curdir/Makefile.tgtname" ;
|
$item = "$curdir/Makefile.$tgtname" ;
|
||||||
if ( ! &CTCMMkelem( $item, $projname, $spec ) ) {
|
if ( ! &CTCMMkelem( $item, $projname, $spec ) ) {
|
||||||
die "Could not make a verioned element of the target makefile\n" ;
|
die "Could not make a verioned element of the target makefile\n" ;
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
require "$tool/inc/ctutils.pl" ;
|
||||||
|
|
||||||
# return the root of the given project.
|
# return the root of the given project.
|
||||||
sub CTProjRoot {
|
sub CTProjRoot {
|
||||||
local( $CTPRtmp ) = $_[0] ;
|
local( $CTPRtmp ) = $_[0] ;
|
||||||
@ -10,8 +12,7 @@ sub CTProjRoot {
|
|||||||
# input:
|
# input:
|
||||||
# $_[0] = project
|
# $_[0] = project
|
||||||
sub CTProjPkg {
|
sub CTProjPkg {
|
||||||
local( $CTPPret ) = `pwd`;
|
local( $CTPPret ) = &CTUCurrDir() ;
|
||||||
chop $CTPPret;
|
|
||||||
local( $CTPPtmp ) = $_[0] ;
|
local( $CTPPtmp ) = $_[0] ;
|
||||||
$CTPPtmp =~ tr/a-z/A-Z/ ;
|
$CTPPtmp =~ tr/a-z/A-Z/ ;
|
||||||
$CTPPret =~ s/$ENV{ $CTPPtmp }// ;
|
$CTPPret =~ s/$ENV{ $CTPPtmp }// ;
|
||||||
@ -25,8 +26,7 @@ sub CTProjPkg {
|
|||||||
sub CTProj {
|
sub CTProj {
|
||||||
local( $CTPdir ) ;
|
local( $CTPdir ) ;
|
||||||
if ($_[0] eq "") {
|
if ($_[0] eq "") {
|
||||||
$CTPdir = `pwd`;
|
$CTPdir = &CTUCurrDir() ;
|
||||||
chop $CTPdir;
|
|
||||||
} else {
|
} else {
|
||||||
# provided directory
|
# provided directory
|
||||||
$CTPdir = $_[0] ;
|
$CTPdir = $_[0] ;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user