[Simplygnustep-cvs] Prometheus2/.scripts .copy-to-install-tree.sh,1.6,1.7 .setup-trees.sh,1.16,1.17 .strip-install-tree.sh,1.2,1.3

[<ceh...@us...>]

Update of /cvsroot/simplygnustep/Prometheus2/.scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv17437/.scripts

Modified Files:
	.copy-to-install-tree.sh .setup-trees.sh 
	.strip-install-tree.sh 
Log Message:
Fixes


Index: .copy-to-install-tree.sh
===================================================================
RCS file: /cvsroot/simplygnustep/Prometheus2/.scripts/.copy-to-install-tree.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .copy-to-install-tree.sh	7 Jul 2003 10:30:56 -0000	1.6
--- .copy-to-install-tree.sh	2 Sep 2003 09:31:07 -0000	1.7
***************
*** 4,126 ****
  #This script selectively picks files to be transferred to the install disc
  
! export INSTALL_DISC=$SGSTEP_TOPLEVEL/InstallDisc &&
! export WORKING_TREE=$SGSTEP_TOPLEVEL/WorkingTree &&
  
  #make some directories
! mkdir -p $INSTALL_DISC/Packages/User &&
! mkdir -p $INSTALL_DISC/Packages/Developer &&
! mkdir -p $INSTALL_DISC/Applications &&
! mkdir -p $INSTALL_DISC/Library &&
! mkdir -p $INSTALL_DISC/Network &&
! mkdir -p $INSTALL_DISC/System &&
! mkdir -p $INSTALL_DISC/Tools &&
! mkdir -p $INSTALL_DISC/Users &&
! mkdir -p $INSTALL_DISC/Volumes/Target &&
! mkdir -p $INSTALL_DISC/Volumes/old &&
! mkdir -p $INSTALL_DISC/X11R6 &&
! mkdir -p $INSTALL_DISC/bin &&
! mkdir -p $INSTALL_DISC/boot &&
! mkdir -p $INSTALL_DISC/dev &&
! mkdir -p $INSTALL_DISC/etc &&
! mkdir -p $INSTALL_DISC/isolinux &&
! mkdir -p $INSTALL_DISC/lib &&
! mkdir -p $INSTALL_DISC/libexec &&
! mkdir -p $INSTALL_DISC/share &&
! mkdir -p $INSTALL_DISC/proc &&
! mkdir -p $INSTALL_DISC/root &&
! mkdir -p $INSTALL_DISC/sbin &&
! mkdir -p $INSTALL_DISC/sysfs &&
! mkdir -p $INSTALL_DISC/tmp &&
! mkdir -p $INSTALL_DISC/var &&
! 
! #our /usr link to /
! #ln -s --target-directory=$INSTALL_DISC . usr &&
  
  
! #/Packages
! echo "Copying /Packages/" &&
! cp -ufR $WORKING_TREE/Packages/User/* $INSTALL_DISC/Packages/User &&
! cp -ufR $WORKING_TREE/Packages/Developer/* $INSTALL_DISC/Packages/Developer &&
  
  #GNUStep stuff
! echo "Copying /Applications" &&
! cp -ufR $WORKING_TREE/Applications/* $INSTALL_DISC/Applications &&
  
! echo "Copying /Library" &&
! cp -ufR $WORKING_TREE/Library/* $INSTALL_DISC/Library &&
  
! echo "Copying /System" &&
! cp -ufR $WORKING_TREE/System/* $INSTALL_DISC/System &&
  
! echo "Copying /Tools" &&
! cp -ufR $WORKING_TREE/Tools/* $INSTALL_DISC/Tools &&
  
  
  #X11R6 stuff
! echo "Copying /X11R6" &&
! cp -fR $WORKING_TREE/X11R6/* $INSTALL_DISC/X11R6 &&
! rm -Rf $INSTALL_DISC/X11R6/include &&
! rm -Rf $INSTALL_DISC/X11R6/man &&
  
  
  #/bin
! echo "Copying /bin/" &&
! cp -rf $WORKING_TREE/bin/* $INSTALL_DISC/bin &&
  
  #/boot   dont know if this is needed since we are using a boot disc onthe cd-rom?
! echo "Copying /boot/" &&
! cp -Rf $WORKING_TREE/boot/* $INSTALL_DISC/boot &&
! #cp -uf $WORKING_TREE/boot/grub/* $INSTALL_DISC/boot/grub &&
  
  #/isolinux
! echo "Copying /isolinux" &&
! cp -rf $WORKING_TREE/lib/syslinux/isolinux.bin $INSTALL_DISC/isolinux &&
! cp -rf $WORKING_TREE/src/linux/arch/i386/boot/bzImage $INSTALL_DISC/isolinux &&
! cp -rf $WORKING_TREE/isolinux.cfg $INSTALL_DISC/isolinux &&
! cp -rf $WORKING_TREE/Source/BootFloppy/initrdfs $INSTALL_DISC/isolinux &&
  
  #/lib
! echo "Copying /lib" &&
! cp -rf $WORKING_TREE/lib/* $INSTALL_DISC/lib &&
! rm -f $INSTALL_DISC/lib/*.a &&
! 
! 
! #/libexec
! echo "Copying /libexec" &&
! cp -rf $WORKING_TREE/libexec/* $INSTALL_DISC/libexec &&
  
! #/local screw up of pciutils
! echo "Copying /local" &&
! cp -rf $WORKING_TREE/local/sbin/* $INSTALL_DISC/sbin &&
! cp -rf $WORKING_TREE/local/share/* $INSTALL_DISC/share &&
  
  
- #/sbin
- echo "Copying /sbin/" &&
- cp -rf $WORKING_TREE/sbin/* $INSTALL_DISC/sbin &&
  
! #/share
! echo "Copying /share/" &&
! cp -rf $WORKING_TREE/share/* $INSTALL_DISC/share &&
  
  
! #and our special cases
! cp -rf $WORKING_TREE/.hidden $INSTALL_DISC/ &&
! cp -rf $WORKING_TREE/mnt $INSTALL_DISC/ &&
! cp -rf $WORKING_TREE/home $INSTALL_DISC/ &&
! cp -rf $WORKING_TREE/usr $INSTALL_DISC/ &&
  
  
  
  
  
- #Tar up /root, /var, and /etc
- echo "Tarring up /root, /var, and /etc" &&
- cd $WORKING_TREE/root;tar vfcz $INSTALL_DISC/root.tar.gz * &&
- cd $WORKING_TREE/var;tar  vfcz $INSTALL_DISC/var.tar.gz  * &&
- cd $WORKING_TREE/etc;tar  vfcz $INSTALL_DISC/etc.tar.gz  * 
  
  
  
  
  
--- 4,138 ----
  #This script selectively picks files to be transferred to the install disc
  
! export INSTALL_DISC=$SGSTEP_TOPLEVEL/InstallDisc 
! export WORKING_TREE=$SGSTEP_TOPLEVEL/WorkingTree 
  
  #make some directories
! mkdir -p $INSTALL_DISC/Packages/User 
! mkdir -p $INSTALL_DISC/Packages/Developer 
! mkdir -p $INSTALL_DISC/Applications 
! mkdir -p $INSTALL_DISC/Library 
! mkdir -p $INSTALL_DISC/Network 
! mkdir -p $INSTALL_DISC/System 
! mkdir -p $INSTALL_DISC/Tools 
! mkdir -p $INSTALL_DISC/Users 
! mkdir -p $INSTALL_DISC/Volumes/Target 
! mkdir -p $INSTALL_DISC/Volumes/old 
! mkdir -p $INSTALL_DISC/opt/X11R6 
! mkdir -p $INSTALL_DISC/bin 
! mkdir -p $INSTALL_DISC/boot 
! mkdir -p $INSTALL_DISC/dev 
! mkdir -p $INSTALL_DISC/etc 
! mkdir -p $INSTALL_DISC/isolinux 
! mkdir -p $INSTALL_DISC/lib 
! mkdir -p $INSTALL_DISC/proc 
! mkdir -p $INSTALL_DISC/root 
! mkdir -p $INSTALL_DISC/sbin 
! mkdir -p $INSTALL_DISC/sys 
! mkdir -p $INSTALL_DISC/tmp 
! mkdir -p $INSTALL_DISC/usr 
! mkdir -p $INSTALL_DISC/usr/bin 
! mkdir -p $INSTALL_DISC/usr/lib 
! mkdir -p $INSTALL_DISC/usr/libexec 
! mkdir -p $INSTALL_DISC/usr/sbin 
! mkdir -p $INSTALL_DISC/usr/share 
! mkdir -p $INSTALL_DISC/var 
  
  
! #Packages
! echo "Copying /Packages/" 
! cp -fR $WORKING_TREE/Packages/User/* $INSTALL_DISC/Packages/User 
! cp -fR $WORKING_TREE/Packages/Developer/* $INSTALL_DISC/Packages/Developer 
  
  #GNUStep stuff
! echo "Copying /Applications" 
! cp -fR $WORKING_TREE/Applications/* $INSTALL_DISC/Applications 
  
! echo "Copying /Library" 
! cp -fR $WORKING_TREE/Library/* $INSTALL_DISC/Library 
  
! echo "Copying /System" 
! cp -fR $WORKING_TREE/System/* $INSTALL_DISC/System 
  
! echo "Copying /Tools" 
! cp -fR $WORKING_TREE/Tools/* $INSTALL_DISC/Tools 
  
  
  #X11R6 stuff
! echo "Copying /opt/X11R6" 
! cp -fR $WORKING_TREE/opt/X11R6/* $INSTALL_DISC/opt/X11R6 
! rm -Rf $INSTALL_DISC/opt/X11R6/include 
! rm -Rf $INSTALL_DISC/opt/X11R6/lib/*.a 
  
  
  #/bin
! echo "Copying /bin/" 
! cp -Rf $WORKING_TREE/bin/* $INSTALL_DISC/bin 
  
  #/boot   dont know if this is needed since we are using a boot disc onthe cd-rom?
! echo "Copying /boot/" 
! cp -Rf $WORKING_TREE/boot/* $INSTALL_DISC/boot 
  
  #/isolinux
! echo "Copying /isolinux" 
! cp -f $WORKING_TREE/usr/lib/syslinux/isolinux.bin $INSTALL_DISC/isolinux 
! cp -f $WORKING_TREE/boot/bzImage $INSTALL_DISC/isolinux 
! cp -f $WORKING_TREE/isolinux.cfg $INSTALL_DISC/isolinux 
! cp -f $WORKING_TREE/Source/InitRamdiskFS/initrdfs $INSTALL_DISC/isolinux 
  
  #/lib
! echo "Copying /lib" 
! cp -Rf $WORKING_TREE/lib/* $INSTALL_DISC/lib 
! rm -f $INSTALL_DISC/lib/*.a 
  
! #/sbin
! echo "Copying /sbin/" 
! cp -Rf $WORKING_TREE/sbin/* $INSTALL_DISC/sbin 
  
+ #/usr/X11R6 symlink to /opt/X11R6
+ echo "Creating /usr/X11R6 symlink (to /opt/X11R6)" 
+ cd $INSTALL_DISC/usr
+ ln -s ../opt/X11R6 X11R6
  
  
! #/usr/bin
! echo "Copying /usr/bin" 
! cp -Rf $WORKING_TREE/usr/bin/* $INSTALL_DISC/usr/bin 
  
+ #/usr/lib
+ echo "Copying /usr/lib" 
+ cp -Rf $WORKING_TREE/usr/lib/* $INSTALL_DISC/usr/lib 
+ rm -f $INSTALL_DISC/usr/lib/*.a 
  
! #/usr/libexec
! echo "Copying /usr/libexec" 
! cp -Rf $WORKING_TREE/usr/libexec/* $INSTALL_DISC/usr/libexec 
  
+ #/usr/sbin
+ echo "Copying /usr/sbin" 
+ cp -Rf $WORKING_TREE/usr/sbin/* $INSTALL_DISC/usr/sbin 
  
+ #/usr/share
+ echo "Copying /usr/share" 
+ cp -Rf $WORKING_TREE/usr/share/* $INSTALL_DISC/usr/share 
+ rm -Rf $INSTALL_DISC/usr/share/man 
+ rm -Rf $INSTALL_DISC/usr/share/info 
  
  
+ #and our special cases
+ cp -rf $WORKING_TREE/.hidden $INSTALL_DISC/ 
+ cp -Rf $WORKING_TREE/mnt $INSTALL_DISC/ 
+ cp -Rf $WORKING_TREE/home $INSTALL_DISC/ 
  
  
  
  
  
+ #Tar up /root, /var, and /etc
+ echo "Tarring up /root, /var, and /etc" 
+ cd $WORKING_TREE/root
+ tar vfcz $INSTALL_DISC/root.tar.gz * 
+ cd $WORKING_TREE/var
+ tar  vfcz $INSTALL_DISC/var.tar.gz  * 
+ cd $WORKING_TREE/etc
+ tar  vfcz $INSTALL_DISC/etc.tar.gz  * 
  

Index: .setup-trees.sh
===================================================================
RCS file: /cvsroot/simplygnustep/Prometheus2/.scripts/.setup-trees.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** .setup-trees.sh	25 Aug 2003 07:34:09 -0000	1.16
--- .setup-trees.sh	2 Sep 2003 09:31:07 -0000	1.17
***************
*** 22,26 ****
  mkdir -p bin &&
  mkdir -p boot/grub &&
! mkdir -p boot/initrd &&
  mkdir -p opt &&
  mkdir -p sbin &&
--- 22,26 ----
  mkdir -p bin &&
  mkdir -p boot/grub &&
! mkdir -p isolinux &&
  mkdir -p opt &&
  mkdir -p sbin &&

Index: .strip-install-tree.sh
===================================================================
RCS file: /cvsroot/simplygnustep/Prometheus2/.scripts/.strip-install-tree.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .strip-install-tree.sh	4 Jul 2003 22:31:00 -0000	1.2
--- .strip-install-tree.sh	2 Sep 2003 09:31:07 -0000	1.3
***************
*** 4,15 ****
  #This script selectively picks files to be transferred to the install disc
  
! export INSTALL_DISC=$SGSTEP_TOPLEVEL/InstallDisc &&
! export WORKING_TREE=$SGSTEP_TOPLEVEL/WorkingTree &&
  
! $WORKING_TREE/bin/strip-static --strip-debug $INSTALL_DISC/bin/*
! $WORKING_TREE/bin/strip-static --strip-debug $INSTALL_DISC/sbin/*
! $WORKING_TREE/bin/strip-static --strip-debug $INSTALL_DISC/lib/*
! $WORKING_TREE/bin/strip-static --strip-debug $INSTALL_DISC/X11R6/bin/*
! $WORKING_TREE/bin/strip-static --strip-debug $INSTALL_DISC/X11R6/lib/*
  
  echo "Done Stripping"
--- 4,28 ----
  #This script selectively picks files to be transferred to the install disc
  
! export INSTALL_DISC=$SGSTEP_TOPLEVEL/InstallDisc 
! export WORKING_TREE=$SGSTEP_TOPLEVEL/WorkingTree 
  
! echo "Stripping /bin"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/bin/* 2>/dev/null
! echo "Stripping /sbin"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/sbin/* 2>/dev/null
! echo "Stripping /lib"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/lib/* 2> /dev/null
! echo "Stripping /usr/bin"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/usr/bin/* 2> /dev/null
! echo "Stripping /usr/sbin"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/usr/sbin/* 2> /dev/null
! echo "Stripping /usr/lib"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/usr/lib/* 2> /dev/null
! echo "Stripping /usr/libexec"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/usr/libexec/* 2> /dev/null
! echo "Stripping /opt/X11R6/bin"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/opt/X11R6/bin/* 2> /dev/null
! echo "Stripping /opt/X11R6/lib"
! sudo $WORKING_TREE/usr/bin/strip-static --strip-debug $INSTALL_DISC/opt/X11R6/lib/* 2> /dev/null
  
  echo "Done Stripping"