to new 'built' form

direct/.gitignore

@@ -1,9 +1,5 @@
 *.pyc
 /__init__.py
-/bin/
-/etc/
-/include/
-/lib/
-/shared/
+/built/
 Makefile
 pp.dep

direct/Package.pp

@@ -36,18 +36,15 @@
 
 // Where should we install DIRECT?
 #if $[DIRECT_INSTALL]
-  #define DIRECT_INSTALL $[DIRECT_INSTALL]
-  #define DIRECT_INSTALL_OTHER $(DIRECT_INSTALL)
+  #define DIRECT_INSTALL $[unixfilename $[DIRECT_INSTALL]]
 #elif $[or $[CTPROJS],$[DIRECT]]
   #set DIRECT $[unixfilename $[DIRECT]]
-  #define DIRECT_INSTALL $[DIRECT]
-  #define DIRECT_INSTALL_OTHER $(DIRECT)
+  #define DIRECT_INSTALL $[DIRECT]/built
   #if $[eq $[DIRECT],]
     #error You seem to be attached to some trees, but not DIRECT!
   #endif
 #else
   #defer DIRECT_INSTALL $[unixfilename $[INSTALL_DIR]]
-  #defer DIRECT_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
 // Also get the PANDA Package file and everything that includes.

direct/src/configfiles/direct.prc.pp

@@ -10,8 +10,8 @@
 #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[notdir $[THISFILENAME]].
 ################################# DO NOT EDIT ###########################
 
-model-path      $DMODELS
-sound-path      $DMODELS
+model-path      $DMODELS/built
+sound-path      $DMODELS/built
 
 # Define a new egg object type.  See the comments in _panda.prc about this.
 

direct/src/distributed/DoCollectionManager.py

@@ -197,7 +197,11 @@ class DoCollectionManager:
             if location is None:
                 location = (do.parentId, do.zoneId)
 
-            assert do.doId not in self.doId2do
+            #assert do.doId not in self.doId2do
+            if do.doId in self.doId2do:
+                print "ignoring repeated object %s" % (do.doId)
+                return
+            
             self.doId2do[do.doId]=do
 
             if self.isValidLocationTuple(location):

direct/src/ffi/genPyCode.pp

@@ -127,7 +127,7 @@ FFIConstants.wantTypeChecking = 0
 # Actually, the user is expected to be using ctattach, so never mind
 # on the baked-in stuff--replace it with the dynamic settings from
 # ctattach.
-DoGenPyCode.outputDir = os.path.join(directDir, 'lib', 'pandac')
+DoGenPyCode.outputDir = os.path.join(directDir, 'built', 'lib', 'pandac')
 DoGenPyCode.extensionsDir = os.path.join(directDir, 'src', '$[extensions_name]')
 DoGenPyCode.etcPath = []
 

direct/src/showbase/FindCtaPaths.py

@@ -78,11 +78,11 @@ def getPaths():
                 parents.append(parent)
 
 
-            # We also put tree/lib on sys.path by hand, because we
+            # We also put tree/built/lib on sys.path by hand, because we
             # will need to load up the generated C++ modules that got
             # put there.  Also, we will find the output of genPyCode
-            # in $DIRECT/lib/pandac.
-            libdir = os.path.join(tree, 'lib')
+            # in $DIRECT/built/lib/pandac.
+            libdir = os.path.join(tree, 'built', 'lib')
             if os.path.isdir(libdir):
                 if libdir not in sys.path:
                     sys.path.append(libdir)

dtool/.gitignore

@@ -1,7 +1,4 @@
-/bin/
+/built/
 /dtool_config.h
-/etc/
-/include/
-/lib/
 Makefile
 pp.dep

dtool/Package.pp

@@ -32,9 +32,7 @@
 
 // Where should we install DTOOL, specifically?
 #if $[DTOOL_INSTALL]
-  #set DTOOL $[unixfilename $[DTOOL_INSTALL]]
-  #define DTOOL_INSTALL $[DTOOL]
-  #define DTOOL_INSTALL_OTHER $(DTOOL)
+  #define DTOOL_INSTALL $[unixfilename $[DTOOL_INSTALL]]
 #elif $[or $[CTPROJS],$[DTOOL]]
   // If we are presently attached, use the environment variable.
   // We define two variables: one for ourselves, which burns in the
@@ -46,8 +44,7 @@
   // they will read from the right tree no matter which DTOOL they're
   // attached to.
   #set DTOOL $[unixfilename $[DTOOL]]
-  #define DTOOL_INSTALL $[DTOOL]
-  #define DTOOL_INSTALL_OTHER $(DTOOL)
+  #define DTOOL_INSTALL $[DTOOL]/built
   #if $[eq $[DTOOL],]
     #error You seem to be attached to some trees, but not DTOOL!
   #endif
@@ -55,7 +52,6 @@
   // Otherwise, if we are not attached, install in the standard place
   // (unless the user specifies otherwise).
   #defer DTOOL_INSTALL $[unixfilename $[INSTALL_DIR]]
-  #defer DTOOL_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
 

dtool/src/attach/ctallihave

@@ -9,11 +9,11 @@ if ( $tool eq "" ) {
    die "not configured for using CTtools\n" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $projs = $ENV{"CTPROJS"} ;
 @projsplit = split( / +/, $projs ) ;

dtool/src/attach/ctattach.drv

@@ -25,7 +25,7 @@ if ( $tool eq "" ) {
     die "\$" . "DTOOL environment must be set to use CTtools\n" ;
 }
 
-require "$tool/include/ctattch.pl" ;
+require "$tool/built/include/ctattch.pl" ;
 
 $tmpname = "/tmp/script.$$" ;
 
@@ -90,8 +90,8 @@ if (( $noflav == 1 ) || ( $flav eq "default" )) {
 # act on the arguments we got
 #
 
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
 
 if (( $proj eq "-" ) || ( $flav eq "-" )) {
    if ( $#ARGV == 0 ) {

dtool/src/attach/ctattch.pl

@@ -1,4 +1,4 @@
-require "$tool/include/ctutils.pl" ;
+require "$tool/built/include/ctutils.pl" ;
 
 $shell_type = "csh" ;
 if ( $ENV{"SHELL_TYPE"} ne "" ) {
@@ -10,7 +10,7 @@ if ( $ENV{"SHELL_TYPE"} ne "" ) {
 $docnt = 0 ;
 @attachqueue = () ;
 
-require "$tool/include/ctquery.pl" ;
+require "$tool/built/include/ctquery.pl" ;
 
 # force set a variable in the 'new' environment
 # input is in:
@@ -147,7 +147,7 @@ sub CTAttachMod {
     }
 }
 
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 # given the project and flavor, build the lists of variables to set/modify
 # input is in:
@@ -224,7 +224,7 @@ sub CTAttachCompute {
 
       # we scan the .init file first because if there are needed sub-attaches
       # they must happen before the rest of our work
-      local( $init ) = "$root/etc/$_[0].init" ;
+      local( $init ) = "$root/built/etc/$_[0].init" ;
       local( %localmod );
       local( %localset );
       local( %localsep );
@@ -365,12 +365,12 @@ sub CTAttachCompute {
       # in the normal sense.
       if ( ! ( $proj =~ /MODELS$/ ) ) {
 
-          $item = $root . "/bin" ;
+          $item = $root . "/built/bin" ;
           #if ( -e $item ) {
       &CTAttachMod( "PATH", $item, $root, $proj ) ;
           #}
 
-          $item = $root . "/lib" ;
+          $item = $root . "/built/lib" ;
           #if ( -e $item ) {
       if ( $ENV{"PENV"} eq "WIN32" ) {
           &CTAttachMod( "PATH", $item, $root, $proj ) ;
@@ -378,17 +378,12 @@ sub CTAttachCompute {
       &CTAttachMod( "LD_LIBRARY_PATH", $item, $root, $proj ) ;
           #}
 
-          #$item = $root . "/src" ;
-          #if ( -e $item ) {
-      #&CTAttachMod( "CDPATH", $item, $root, $proj ) ;
-          #}
-
-          $item = $root . "/include" ;
+          $item = $root . "/built/include" ;
           #if ( -e $item ) {
       &CTAttachMod( "CT_INCLUDE_PATH", $item, $root, $proj ) ;
           #}
 
-          $item = $root . "/etc" ;
+          $item = $root . "/built/etc" ;
           #if ( -e $item ) {
       &CTAttachMod( "ETC_PATH", $item, $root, $proj ) ;
           #}

dtool/src/attach/ctattch.pl.rnd

@@ -1,4 +1,4 @@
-require "$tool/include/ctutils.pl" ;
+require "$tool/built/include/ctutils.pl" ;
 
 # get list of all projects
 sub CTAttachListProj {
@@ -490,7 +490,7 @@ sub CTAttachAddToSet {
 $docnt = 0 ;
 @attachqueue = () ;
 
-require "$tool/include/ctquery.pl" ;
+require "$tool/built/include/ctquery.pl" ;
 
 # given the project and flavor, build the lists of variables to set/modify
 # input is in:

dtool/src/attach/ctccase.pl

@@ -241,7 +241,7 @@ $timestamp =~ s/:/_/g ;
 # output:
 # return success or failure
 sub CTCcaseDelta {
-    require "$tool/include/ctdelta.pl" ;
+    require "$tool/built/include/ctdelta.pl" ;
 
     &CTUDebug( "in CTCcaseDelta\n" ) ;
     local( $ret ) = 0 ;
@@ -310,7 +310,7 @@ sub CTCcaseCheckin {
 # output:
 # return success or failure
 sub CTCcaseUncheckout {
-    require "$tool/include/unco.pl" ;
+    require "$tool/built/include/unco.pl" ;
     &CTUDebug( "in CTCcaseUncheckout\n" ) ;
     local( $ret ) = 1 ;
     # need better error checking on this

dtool/src/attach/ctci

@@ -17,11 +17,11 @@ if ( $tool eq "" ) {
    die "Environment not configured for CTtools" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $comment = "" ;
 

dtool/src/attach/ctcm.pl

@@ -1,5 +1,5 @@
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
 
 # given a spec line, do the 'correct' setup for it
 # input is in:
@@ -11,7 +11,7 @@ sub CTCMSetup {
     if ( $type eq "vroot" ) {
 	&CTUDebug( "running setup for an atria tree\n" ) ;
 	if ( $ENV{"HAVE_ATRIA"} eq "yes" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    &CTAttachCCSetup( $_[0], $_[1], $_[2] ) ;
 	} else {
 	    &CTUDebug( "don't HAVE_ATRIA!\n" ) ;
@@ -19,7 +19,7 @@ sub CTCMSetup {
 	# if we don't have atria, and it's a vroot, well..
     } elsif ( $type eq "croot" ) {
 	&CTUDebug( "running setup for CVS\n" ) ;
-	require "$tool/include/ctcvs.pl" ;
+	require "$tool/built/include/ctcvs.pl" ;
 	local( $serve ) = &CTCvsServerLine( $_[0], $_[1] ) ;
 	local( $thing ) = &CTCvsLogin( $serve ) ;
 	if ( ! $thing ) {
@@ -72,13 +72,13 @@ sub CTCMMkdir {
 	    # now switch off on how to actually do it
 	    local( $type ) = &CTSpecType( $_[2] ) ;
 	    if ( $type eq "vroot" ) {
-		require "$tool/include/ctccase.pl" ;
+		require "$tool/built/include/ctccase.pl" ;
 		$ret = &CTCcaseMkdir( $_[0], $pwd, $_[3] ) ;
 	    } elsif ( $type eq "root" ) {
-		require "$tool/include/ctntool.pl" ;
+		require "$tool/built/include/ctntool.pl" ;
 		$ret = &CTNtoolMkdir( $_[0], $pwd, $_[3] ) ;
 	    } elsif ( $type eq "croot" ) {
-		require "$tool/include/ctcvs.pl" ;
+		require "$tool/built/include/ctcvs.pl" ;
 		$ret = &CTCvsMkdir( $_[0], $_[1], $_[2], $_[3] ) ;
 	    } else {
 		print STDERR "CTCMMkdir::error! got invalid spec type '" .
@@ -141,13 +141,13 @@ sub CTCMMkelem {
 	# now switch off on how to actually do the work
 	local( $type ) = &CTSpecType( $_[2] ) ;
 	if ( $type eq "vroot" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    $ret = &CTCcaseMkelem( $_[0], $pwd, $_[3], $_[4] ) ;
 	} elsif ( $type eq "root" ) {
-	    require "$tool/include/ctntool.pl" ;
+	    require "$tool/built/include/ctntool.pl" ;
 	    $ret = &CTNtoolMkelem( $_[0], $pwd, $_[3], $_[4] ) ;
 	} elsif ( $type eq "croot" ) {
-	    require "$tool/include/ctcvs.pl" ;
+	    require "$tool/built/include/ctcvs.pl" ;
 	    $ret = &CTCvsMkelem( $_[0], $_[1], $_[2], $_[3] ) ;
 	} else {
 	    print STDERR "CTCMMkelem::error! got invalid spec type '" .
@@ -198,13 +198,13 @@ sub CTCMDelta {
 	# now switch off on how to actually do the work
 	local( $type ) = &CTSpecType( $_[2] ) ;
 	if ( $type eq "vroot" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    $ret = &CTCcaseDelta( $_[0] ) ;
 	} elsif ( $type eq "root" ) {
-	    require "$tool/include/ctntool.pl" ;
+	    require "$tool/built/include/ctntool.pl" ;
 	    $ret = &CTNtoolDelta( $_[0] ) ;
 	} elsif ( $type eq "croot" ) {
-	    require "$tool/include/ctcvs.pl" ;
+	    require "$tool/built/include/ctcvs.pl" ;
 	    $ret = &CTCvsDelta( $_[0], $_[1], $_[2] ) ;
 	} else {
 	    print STDERR "CTCMDelta::error! got invalid spec type '" . $type .
@@ -258,13 +258,13 @@ sub CTCMCheckout {
 	# now switch off on how to actually do the work
 	local( $type ) = &CTSpecType( $_[2] ) ;
 	if ( $type eq "vroot" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    $ret = &CTCcaseCheckout( $_[0], $_[3] ) ;
 	} elsif ( $type eq "root" ) {
-	    require "$tool/include/ctntool.pl" ;
+	    require "$tool/built/include/ctntool.pl" ;
 	    $ret = &CTNtoolCheckout( $_[0], $_[3] ) ;
 	} elsif ( $type eq "croot" ) {
-	    require "$tool/include/ctcvs.pl" ;
+	    require "$tool/built/include/ctcvs.pl" ;
 	    $ret = &CTCvsCheckout( $_[0], $_[1], $_[2], $_[3] ) ;
 	} else {
 	    print STDERR "CTCMCheckout::error! got invalid spec type '" .
@@ -316,13 +316,13 @@ sub CTCMCheckin {
 	# now switch off on how to actually do the work
 	local( $type ) = &CTSpecType( $_[2] ) ;
 	if ( $type eq "vroot" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    $ret = &CTCcaseCheckin( $_[0], $_[3] ) ;
 	} elsif ( $type eq "root" ) {
-	    require "$tool/include/ctntool.pl" ;
+	    require "$tool/built/include/ctntool.pl" ;
 	    $ret = &CTNtoolCheckin( $_[0], $_[3] ) ;
 	} elsif ( $type eq "croot" ) {
-	    require "$tool/include/ctcvs.pl" ;
+	    require "$tool/built/include/ctcvs.pl" ;
 	    $ret = &CTCvsCheckin( $_[0], $_[1], $_[2], $_[3] ) ;
 	} else {
 	    print STDERR "CTCMCheckin::error! got invalid spec type '" .
@@ -373,13 +373,13 @@ sub CTCMUncheckout {
 	# now switch off on how to actually do the work
 	local( $type ) = &CTSpecType( $_[2] ) ;
 	if ( $type eq "vroot" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    $ret = &CTCcaseUncheckout( $_[0] ) ;
 	} elsif ( $type eq "root" ) {
-	    require "$tool/include/ctntool.pl" ;
+	    require "$tool/built/include/ctntool.pl" ;
 	    $ret = &CTNtoolUncheckout( $_[0] ) ;
 	} elsif ( $type eq "croot" ) {
-	    require "$tool/include/ctcvs.pl" ;
+	    require "$tool/built/include/ctcvs.pl" ;
 	    $ret = &CTCvsUncheckout( $_[0], $_[1], $_[2] ) ;
 	} else {
 	    print STDERR "CTCMUncheckout::error! got invalid spec type '" .
@@ -403,13 +403,13 @@ sub CTCMIHave {
     local( $ret ) = "" ;
     local( $type ) = &CTSpecType( $_[2] ) ;
     if ( $type eq "vroot" ) {
-	require "$tool/include/ctccase.pl" ;
+	require "$tool/built/include/ctccase.pl" ;
 	$ret = &CTCcaseIHave( $_[0], $_[1], $_[2] ) ;
     } elsif ( $type eq "root" ) {
-	require "$tool/include/ctntool.pl" ;
+	require "$tool/built/include/ctntool.pl" ;
 	$ret = &CTNtoolIHave( $_[0], $_[1], $_[2] ) ;
     } elsif ( $type eq "croot" ) {
-	require "$tool/include/ctcvs.pl" ;
+	require "$tool/built/include/ctcvs.pl" ;
 	$ret = &CTCvsIHave( $_[0], $_[1], $_[2] ) ;
     } else {
 	print STDERR "CTCMIHave::error! got invalid spec type '" . $type .
@@ -459,13 +459,13 @@ sub CTCMRmElem {
 	# now switch off on how to actually do the work
 	local( $type ) = &CTSpecType( $_[2] ) ;
 	if ( $type eq "vroot" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    $ret = &CTCcaseRnElem( $_[0], $pwd ) ;
 	} elsif ( $type eq "root" ) {
-	    require "$tool/include/ctntool.pl" ;
+	    require "$tool/built/include/ctntool.pl" ;
 	    $ret = &CTNtoolRmElem( $_[0], $pwd ) ;
 	} elsif ( $type eq "croot" ) {
-	    require "$tool/include/ctcvs.pl" ;
+	    require "$tool/built/include/ctcvs.pl" ;
 	    $ret = &CTCvsRmElem( $_[0], $_[1], $_[2] ) ;
 	} else {
 	    print STDERR "CTCMRmElem::error! got invalid spec type '" .
@@ -529,13 +529,13 @@ sub CTCMMv {
 	# now switch off on how to actually do the work
 	local( $type ) = &CTSpecType( $_[3] ) ;
 	if ( $type eq "vroot" ) {
-	    require "$tool/include/ctccase.pl" ;
+	    require "$tool/built/include/ctccase.pl" ;
 	    $ret = &CTCcaseMv( $_[0], $_[1], $pwd ) ;
 	} elsif ( $type eq "root" ) {
-	    require "$tool/include/ctntool.pl" ;
+	    require "$tool/built/include/ctntool.pl" ;
 	    $ret = &CTNtoolMv( $_[0], $_[1], $pwd ) ;
 	} elsif ( $type eq "croot" ) {
-	    require "$tool/include/ctcvs.pl" ;
+	    require "$tool/built/include/ctcvs.pl" ;
 	    $ret = &CTCvsMv( $_[0], $_[1], $_[2], $_[3] ) ;
 	} else {
 	    print STDERR "CTCMMv::error! got invalid spec type '" .
@@ -560,13 +560,13 @@ sub CTCMMake {
     # now switch off on how to actually do the work
     local( $type ) = &CTSpecType( $_[2] ) ;
     if ( $type eq "vroot" ) {
-	require "$tool/include/ctccase.pl" ;
+	require "$tool/built/include/ctccase.pl" ;
 	$ret = &CTCcaseMake( $_[0] ) ;
     } elsif ( $type eq "root" ) {
-	require "$tool/include/ctntool.pl" ;
+	require "$tool/built/include/ctntool.pl" ;
 	$ret = &CTNtoolMake( $_[0] ) ;
     } elsif ( $type eq "croot" ) {
-	require "$tool/include/ctcvs.pl" ;
+	require "$tool/built/include/ctcvs.pl" ;
 	$ret = &CTCvsMake( $_[0] ) ;
     } else {
 	print STDERR "CTCMMake::error! got invalid spec type '" . $type .

dtool/src/attach/ctco

@@ -17,11 +17,11 @@ if ( $tool eq "" ) {
    die "Environment not configured for CTtools" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $comment = "" ;
 

dtool/src/attach/ctcvs.pl

@@ -88,7 +88,7 @@ sub CTCvsLogin {
     $ret ;
 }
 
-require "$tool/include/ctproj.pl" ;
+require "$tool/built/include/ctproj.pl" ;
 
 # add a versioned element to the repository
 # input is in:

dtool/src/attach/ctdelta

@@ -9,11 +9,11 @@ if ( $tool eq "" ) {
     die "not configured for using ct-tools\n" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $comment = "" ;
 $skip = 0 ;

dtool/src/attach/ctihave

@@ -9,11 +9,11 @@ if ( $tool eq "" ) {
    die "not configured for using CTtools\n" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $projname = &CTProj ;
 $projname =~ tr/A-Z/a-z/ ;

dtool/src/attach/ctmake

@@ -5,11 +5,11 @@ if ( $tool eq "" ) {
     die "not configured for using ct-tools\n" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $projname = &CTProj ;
 $projname =~ tr/A-Z/a-z/ ;

dtool/src/attach/ctmkdir

@@ -17,11 +17,11 @@ if ( $tool eq "" ) {
    die "Environment not configured for CTtools" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $comment = "" ;
 if ( $ARGV[0] eq "-nc" ) {

dtool/src/attach/ctmkelem

@@ -18,11 +18,11 @@ if ( $tool eq "" ) {
    die "Environment not configured for CTtools" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $comment = "" ;
 $eltype = "" ;

dtool/src/attach/ctmv

@@ -9,11 +9,11 @@ if ( $tool eq "" ) {
    die "Environment not configured for CTtools" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $projname = &CTProj ;
 $projname =~ tr/A-Z/a-z/ ;

dtool/src/attach/ctproj.pl

@@ -1,4 +1,4 @@
-require "$tool/include/ctutils.pl" ;
+require "$tool/built/include/ctutils.pl" ;
 
 # return the root of the given project.
 sub CTProjRoot {

dtool/src/attach/ctrm

@@ -9,11 +9,11 @@ if ( $tool eq "" ) {
    die "Environment not configured for CTtools" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $projname = &CTProj ;
 $projname =~ tr/A-Z/a-z/ ;

dtool/src/attach/ctsanity

@@ -27,7 +27,7 @@ foreach $item ( @ARGV ) {
     }
 }
 
-require "$tool/include/ctvspec.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
 
 if ( $check_vspecs ) {
     local( $projs ) = &CTListAllProjects ;

dtool/src/attach/ctunattach.drv

@@ -12,9 +12,9 @@ sub CTUnattachUsage {
 
 $tool = $ENV{"DTOOL"} ;
 
-require "$tool/include/ctattch.pl" ;
-require "$tool/include/ctunattach.pl" ;
-require "$tool/include/ctquery.pl" ;
+require "$tool/built/include/ctattch.pl" ;
+require "$tool/built/include/ctunattach.pl" ;
+require "$tool/built/include/ctquery.pl" ;
 
 $tmpname = "/tmp/script.$$" ;
 

dtool/src/attach/ctunattach.pl

@@ -1,4 +1,4 @@
-require "$tool/include/ctquery.pl" ;
+require "$tool/built/include/ctquery.pl" ;
 
 $shell_type = "csh" ;
 if ( $ENV{"SHELL_TYPE"} ne "" ) {
@@ -85,33 +85,33 @@ sub CTUnattachCompute {
       # if we scan the .init file first or not.  So we won't.
       &CTUDebug( "extending paths\n" ) ;
 
-      $item = $root . "/bin" ;
+      $item = $root . "/built/bin" ;
       &CTUnattachMod( "PATH", $item ) ;
-      $item = $root . "/lib" ;
+      $item = $root . "/built/lib" ;
       if ( $ENV{"PENV"} eq "WIN32" ) {
 	  &CTUnattachMod( "PATH", $item ) ;
       }
       &CTUnattachMod( "LD_LIBRARY_PATH", $item ) ;
       #$item = $root . "/src/all" ;
       #&CTUnattachMod( "CDPATH", $item ) ;
-      $item = $root . "/include" ;
+      $item = $root . "/built/include" ;
       &CTUnattachMod( "CT_INCLUDE_PATH", $item ) ;
-      $item = $root . "/etc" ;
+      $item = $root . "/built/etc" ;
       &CTUnattachMod( "ETC_PATH", $item ) ;
       $item = $proj . ":" . $flav ;
       &CTUnattachMod( "CTPROJS", $item ) ;
       push( @unset, $proj ) ;
 
-      if ( -e "$root/etc/$_[0].init" ) {
+      if ( -e "$root/built/etc/$_[0].init" ) {
 	 &CTUDebug( "scanning $_[0].init file\n" ) ;
 	 local( @linesplit ) ;
 	 local( $linetmp ) ;
 	 local( $loop );
 	 local( *INITFILE ) ;
-	 if ( -x "$root/etc/$_[0].init" ) {
-	    open( INITFILE, "$root/etc/$_[0].init $_[0] $_[1] $root |" ) ;
+	 if ( -x "$root/built/etc/$_[0].init" ) {
+	    open( INITFILE, "$root/built/etc/$_[0].init $_[0] $_[1] $root |" ) ;
 	 } else {
-	    open( INITFILE, "< $root/etc/$_[0].init" ) ;
+	    open( INITFILE, "< $root/built/etc/$_[0].init" ) ;
 	 }
 	 while ( <INITFILE> ) {
 	    s/\n$// ;

dtool/src/attach/ctunco

@@ -9,11 +9,11 @@ if ( $tool eq "" ) {
     die "not configured for using CTtools" ;
 }
 
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctvspec.pl" ;
-require "$tool/include/ctquery.pl" ;
-require "$tool/include/ctproj.pl" ;
-require "$tool/include/ctcm.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctvspec.pl" ;
+require "$tool/built/include/ctquery.pl" ;
+require "$tool/built/include/ctproj.pl" ;
+require "$tool/built/include/ctcm.pl" ;
 
 $projname = &CTProj ;
 $projname =~ tr/A-Z/a-z/ ;

dtool/src/attach/ctvspec.pl

@@ -1,4 +1,4 @@
-require "$tool/include/ctutils.pl" ;
+require "$tool/built/include/ctutils.pl" ;
 
 # read a .vspec file into a map
 # $_[0] = project

dtool/src/attach/dtool.cshrc

@@ -80,14 +80,14 @@ endif
 
 if ( ! $?DTOOL ) setenv DTOOL /beta/player/bootstrap/dtool
 if ( $#argv == 0 ) then
-   setenv SETUP_SCRIPT `$DTOOL/bin/ctattach.drv dtool default`
+   setenv SETUP_SCRIPT `$DTOOL/built/bin/ctattach.drv dtool default`
 else
-   setenv SETUP_SCRIPT `$DTOOL/bin/ctattach.drv dtool $argv[1]`
+   setenv SETUP_SCRIPT `$DTOOL/built/bin/ctattach.drv dtool $argv[1]`
 endif
 
 if($SETUP_SCRIPT == "") then
   echo "error: ctattach.drv returned NULL string for setup_script filename!"
-  echo "       'dtool/bin/ctattach.drv' probably doesnt exist, need to make install on dtool to copy it from dtool\src\attach"
+  echo "       'dtool/built/bin/ctattach.drv' probably doesnt exist, need to make install on dtool to copy it from dtool\src\attach"
   exit
 endif
 

dtool/src/attach/dtool.init

@@ -1,9 +1,9 @@
-MODREL ETC_PATH etc
-DOCSH source $DTOOL/etc/dtool.alias
+MODREL ETC_PATH built/etc
+DOCSH source $DTOOL/built/etc/dtool.alias
 DOCSH unsetenv LASTLOGIN
 DOCSH setenv OS_VER `uname -r`
 DOCSH ctshowprojs
-DOSH source $DTOOL/etc/dtool.alias-sh
+DOSH source $DTOOL/built/etc/dtool.alias-sh
 DOSH LASTLOGIN=
 DOSH export LASTLOGIN
 DOSH OS_VER=`uname -r`

dtool/src/attach/dtool.sh

@@ -73,7 +73,7 @@ fi
 export PENV
 
 if [ -z "$1" ]; then
-  source `$DTOOL/bin/ctattach.drv dtool default`
+  source `$DTOOL/built/bin/ctattach.drv dtool default`
 else
-  source `$DTOOL/bin/ctattach.drv dtool $1`
+  source `$DTOOL/built/bin/ctattach.drv dtool $1`
 fi

dtool/src/attach/unco.pl

@@ -1,5 +1,5 @@
-require "$tool/include/ctutils.pl" ;
-require "$tool/include/ctdelta.pl" ;
+require "$tool/built/include/ctutils.pl" ;
+require "$tool/built/include/ctdelta.pl" ;
 
 # Remove a branch for an element if needed
 # input is in:

panda/.gitignore

@@ -1,7 +1,3 @@
-/bin/
-/etc/
-/include/
-/lib/
-/shared/
+/built/
 Makefile
 pp.dep

panda/Package.pp

@@ -36,18 +36,15 @@
 
 // Where should we install PANDA?
 #if $[PANDA_INSTALL]
-  #define PANDA_INSTALL $[PANDA_INSTALL]
-  #define PANDA_INSTALL_OTHER $(PANDA_INSTALL)
+  #define PANDA_INSTALL $[unixfilename $[PANDA_INSTALL]]
 #elif $[or $[CTPROJS],$[PANDA]]
   #set PANDA $[unixfilename $[PANDA]]
-  #define PANDA_INSTALL $[PANDA]
-  #define PANDA_INSTALL_OTHER $(PANDA)
+  #define PANDA_INSTALL $[PANDA]/built
   #if $[eq $[PANDA],]
     #error You seem to be attached to some trees, but not PANDA!
   #endif
 #else
   #defer PANDA_INSTALL $[unixfilename $[INSTALL_DIR]]
-  #defer PANDA_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
 // Also get the DTOOL Package file and everything that includes.

panda/src/configfiles/panda.init

@@ -1,5 +1,5 @@
 SETABS PANDA_VER 0.8
-MODREL ETC_PATH etc
+MODREL ETC_PATH built/etc
 DOCSH if ( ! $?CONFIG_CONFIG ) then
 DOCSH   setenv CONFIG_CONFIG :configpath=CFG_PATH:configpath=ETC_PATH
 DOCSH   setenv CFG_PATH ~

pandatool/.gitignore

@@ -1,7 +1,3 @@
-/bin/
-/etc/
-/include/
-/lib/
-/shared/
+/built/
 Makefile
 pp.dep

pandatool/Package.pp

@@ -37,14 +37,12 @@
 // Where should we install PANDATOOL?
 #if $[or $[CTPROJS],$[PANDATOOL]]
   #set PANDATOOL $[unixfilename $[PANDATOOL]]
-  #define PANDATOOL_INSTALL $[PANDATOOL]
-  #define PANDATOOL_INSTALL_OTHER $(PANDATOOL)
+  #define PANDATOOL_INSTALL $[PANDATOOL]/built
   #if $[eq $[PANDATOOL],]
     #error You seem to be attached to some trees, but not PANDATOOL!
   #endif
 #else
   #defer PANDATOOL_INSTALL $[unixfilename $[INSTALL_DIR]]
-  #defer PANDATOOL_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
 #endif
 
 // Also get the PANDA Package file and everything that includes.