Changeset 2334

Timestamp:

2001-04-23 16:25:44 (8 years ago)

Author:

sjboddie

Message:

Tidied up the "export collection" function a little

Files:

• trunk/gsdl/Install.sh (modified) (2 diffs)
• trunk/gsdl/bin/script/create_distributions.pl (modified) (4 diffs)
• trunk/gsdl/bin/script/exportcol.pl (modified) (4 diffs)

trunk/gsdl/Install.sh

@@ -94 +94 @@
-if [ "$gsdlos" = "linux" ]; then
-msg="${msg}--A standard linux binary installation requires approximately
-3
+5
-"
-fi
-msg="${msg}--Compiling Greenstone from source code requires approximately
-3
+5
---Optional Greenstone demonstration collections may require up
-  to 200Mb of free disk space (you'll be told the size of 
@@ -205 +205 @@
-echo "$msg" >> "${gsdlhome}/INSTALL_RECORD"
-$cmd_cpr "${cd_dir}/gsdl/"* "$gsdlhome"
+
+# copy across those parts of bin/windows that are required by exportcol.pl
+$net16dir="${cd_dir}/bin/windows/net16"
+$net32dir="${cd_dir}/bin/windows/net32"
+$netscapedir="${cd_dir}/bin/windows/netscape"
+$netwin32s="${cd_dir}/bin/windows/Win32s"
+if [ ! -d "${gsdlhome}/bin/windows" ]; then
+    $msg="--> Install.sh: [$cmd_mkdir \"${gsdlhome}/bin/windows\"]";
+    echo "$msg"
+    echo "$msg" >> "${gsdlhome}/INSTALL_RECORD"
+    $cmd_mkdir "${gsdlhome}/bin/windows"
+fi
+if [ -d "$net16dir" ]; then
+    msg="--> Install.sh [$cmd_cpr \"${net16dir}\" \"${gsdlhome}/bin/windows\"]"
+    echo "$msg"
+    echo "$msg" >> "${gsdlhome}/INSTALL_RECORD"
+    $cmd_cpr "$net16dir" "${gsdlhome}/bin/windows"
+fi
+if [ -d "$net32dir" ]; then
+    msg="--> Install.sh [$cmd_cpr \"${net32dir}\" \"${gsdlhome}/bin/windows\"]"
+    echo "$msg"
+    echo "$msg" >> "${gsdlhome}/INSTALL_RECORD"
+    $cmd_cpr "$net32dir" "${gsdlhome}/bin/windows"
+fi
+if [ -d "$netscapedir" ]; then
+    msg="--> Install.sh [$cmd_cpr \"${netscapedir}\" \"${gsdlhome}/bin/windows\"]"
+    echo "$msg"
+    echo "$msg" >> "${gsdlhome}/INSTALL_RECORD"
+    $cmd_cpr "$netscapedir" "${gsdlhome}/bin/windows"
+fi
+if [ -d "$win32sdir" ]; then
+    msg="--> Install.sh [$cmd_cpr \"${win32sdir}\" \"${gsdlhome}/bin/windows\"]"
+    echo "$msg"
+    echo "$msg" >> "${gsdlhome}/INSTALL_RECORD"
+    $cmd_cpr "$win32sdir" "${gsdlhome}/bin/windows"
+fi
-
-# copy setup shell scripts across too

trunk/gsdl/bin/script/create_distributions.pl

@@ -165 +165 @@
-
-    # Windows directory
-
+, 0
-}
-
@@ -223 +223 @@
-
-    # Windows directory
-
+, 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 {
-
+, $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";
-
+net32 net16 
-    print MANIFESTCFG "database:\n";
-
+etc 
-    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) ||
-
+
+
-        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