Changeset 2334
- Timestamp:
- 2001-04-23T16:25:44+12:00 (23 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/bin/script/create_distributions.pl
r2033 r2334 165 165 166 166 # Windows directory 167 &install_windows_specific ($windows_dist_dir );167 &install_windows_specific ($windows_dist_dir, 0); 168 168 } 169 169 … … 223 223 224 224 # Windows directory 225 &install_windows_specific ($cdrom_dist_dir );225 &install_windows_specific ($cdrom_dist_dir, 1); 226 226 227 227 # Unix directory … … 319 319 } 320 320 321 # if $cd_rom is not true then we don't want to include the net16, net32, 322 # Win32s or netscape directories in the bin/windows directory (note that 323 # this currently means exportcol.pl will fail for all but cd-rom installed 324 # distributions) 321 325 sub install_windows_specific { 322 my ($install_dir ) = @_;326 my ($install_dir, $cd_rom) = @_; 323 327 324 328 my $windir = &util::filename_cat ($install_dir, "Windows"); … … 327 331 mkdir ($winbindir, 0777); 328 332 &util::cp_r ($winbin, $winbindir); 333 334 if (!$cd_rom) { 335 &util::rm_r (&util::filename_cat ($winbindir, "net16")); 336 &util::rm_r (&util::filename_cat ($winbindir, "net32")); 337 &util::rm_r (&util::filename_cat ($winbindir, "Win32s")); 338 &util::rm_r (&util::filename_cat ($winbindir, "netscape")); 339 } 329 340 330 341 # make sure there aren't any CVS directories laying around -
trunk/gsdl/bin/script/exportcol.pl
r2138 r2334 118 118 print MANIFESTCFG " {library} {collection}\n\n"; 119 119 print MANIFESTCFG "library:\n"; 120 print MANIFESTCFG " server.exe\n\n";120 print MANIFESTCFG " net32 net16 server.exe\n\n"; 121 121 print MANIFESTCFG "database:\n"; 122 print MANIFESTCFG ' collect\$(COLDIRNAME)\index\text\$(COLDIRNAME).ldb' . "\n\n";122 print MANIFESTCFG ' etc collect\$(COLDIRNAME)\index\text\$(COLDIRNAME).ldb' . "\n\n"; 123 123 print MANIFESTCFG "collection:\n"; 124 124 print MANIFESTCFG " collect etc images macros mappings\n"; … … 133 133 my $gssetupexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "gssetup.exe"); 134 134 my $setupexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "Setup.exe"); 135 my $net32dir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "net32"); 136 my $net16dir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "net16"); 137 my $netscapedir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "netscape"); 138 my $win32sdir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "Win32s"); 135 139 136 140 if ((!-d $imagesdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) || 137 (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe)) { 141 (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe) || (!-d $net32dir) || 142 (!-d $net16dir) || (!-d $netscapedir) || (!-d $win32sdir)) { 138 143 print $out "exportcol.pl failed: One or more the the following necessary\n"; 139 144 print $out "files and directories does not exist\n\n"; … … 145 150 print $out " $gssetupexe\n"; 146 151 print $out " $setupexe\n"; 152 print $out " $net32dir\n"; 153 print $out " $net16dir\n"; 154 print $out " $netscapedir\n"; 155 print $out " $win32sdir\n"; 147 156 die "\n"; 148 157 } … … 155 164 &util::cp ($gssetupexe, $topdir); 156 165 &util::cp ($setupexe, $topdir); 166 &util::cp_r ($net32dir, $gsdldir); 167 &util::cp_r ($net16dir, $gsdldir); 168 &util::cp_r ($netscapedir, $topdir); 169 &util::cp_r ($win32sdir, $topdir); 157 170 158 171 # copy the collection itself
Note:
See TracChangeset
for help on using the changeset viewer.