Changeset 2334

Timestamp:

2001-04-23T16:25:44+12:00 (23 years ago)

Author:

sjboddie

Message:

Tidied up the "export collection" function a little

Location:

trunk/gsdl

Files:

• Install.sh (modified) ( previous)
• bin/script/create_distributions.pl (modified) (4 diffs)
• bin/script/exportcol.pl (modified) (4 diffs)

trunk/gsdl/bin/script/create_distributions.pl

@@ -165 +165 @@
 
     # Windows directory
-    &install_windows_specific ($windows_dist_dir);
+    &install_windows_specific ($windows_dist_dir, 0);
 }
 
@@ -223 +223 @@
 
     # Windows directory
-    &install_windows_specific ($cdrom_dist_dir);
+    &install_windows_specific ($cdrom_dist_dir, 1);
 
     # Unix directory
@@ -319 +319 @@
 }
 
+# if $cd_rom is not true then we don't want to include the net16, net32,
+# Win32s or netscape directories in the bin/windows directory (note that
+# this currently means exportcol.pl will fail for all but cd-rom installed
+# distributions)
 sub install_windows_specific {
-    my ($install_dir) = @_;
+    my ($install_dir, $cd_rom) = @_;
 
     my $windir = &util::filename_cat ($install_dir, "Windows");
@@ -327 +331 @@
     mkdir ($winbindir, 0777);
     &util::cp_r ($winbin, $winbindir);
+
+    if (!$cd_rom) {
+    &util::rm_r (&util::filename_cat ($winbindir, "net16"));
+    &util::rm_r (&util::filename_cat ($winbindir, "net32"));
+    &util::rm_r (&util::filename_cat ($winbindir, "Win32s"));
+    &util::rm_r (&util::filename_cat ($winbindir, "netscape"));
+    }
 
     # make sure there aren't any CVS directories laying around

trunk/gsdl/bin/script/exportcol.pl

@@ -118 +118 @@
     print MANIFESTCFG "  {library} {collection}\n\n";
     print MANIFESTCFG "library:\n";
-    print MANIFESTCFG "  server.exe\n\n";
+    print MANIFESTCFG "  net32 net16 server.exe\n\n";
     print MANIFESTCFG "database:\n";
-    print MANIFESTCFG '  collect\$(COLDIRNAME)\index\text\$(COLDIRNAME).ldb' . "\n\n";
+    print MANIFESTCFG '  etc collect\$(COLDIRNAME)\index\text\$(COLDIRNAME).ldb' . "\n\n";
     print MANIFESTCFG "collection:\n";
     print MANIFESTCFG "  collect etc images macros mappings\n";
@@ -133 +133 @@
     my $gssetupexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "gssetup.exe");
     my $setupexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "Setup.exe");
+    my $net32dir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "net32");
+    my $net16dir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "net16");
+    my $netscapedir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "netscape");
+    my $win32sdir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "Win32s");
 
     if ((!-d $imagesdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) ||
-    (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe)) {
+    (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe) || (!-d $net32dir) ||
+    (!-d $net16dir) || (!-d $netscapedir) || (!-d $win32sdir)) {
     print $out "exportcol.pl failed: One or more the the following necessary\n";
     print $out "files and directories does not exist\n\n";
@@ -145 +150 @@
     print $out "  $gssetupexe\n";
     print $out "  $setupexe\n";
+    print $out "  $net32dir\n";
+    print $out "  $net16dir\n";
+    print $out "  $netscapedir\n";
+    print $out "  $win32sdir\n";
     die "\n";
     }
@@ -155 +164 @@
     &util::cp ($gssetupexe, $topdir);
     &util::cp ($setupexe, $topdir);
+    &util::cp_r ($net32dir, $gsdldir);
+    &util::cp_r ($net16dir, $gsdldir);
+    &util::cp_r ($netscapedir, $topdir);
+    &util::cp_r ($win32sdir, $topdir);
 
     # copy the collection itself