Changeset 8399

Timestamp:

2004-10-20T19:15:35+13:00 (20 years ago)

Author:

mdewsnip

Message:

Updated for the Greenstone 2.52 release.

Location:

trunk

Files:

• for-distributions/DistDates (modified) (1 diff)
• for-distributions/zip-web.sh (modified) (1 diff)
• gsdl/bin/script/create_distributions.pl (modified) (9 diffs)

trunk/for-distributions/DistDates

@@ -11 +11 @@
 gsdl-2_50-distribution  Wed Apr  7 13:54:07 NZST 2004
 gsdl-2_51-distribution  Thu Jun 17 16:23:09 NZST 2004
+gsdl-2_52-distribution  Wed Oct 20 17:27:23 NZDT 2004

trunk/for-distributions/zip-web.sh

@@ -39 +39 @@
 cp etc/main.cfg $distribution_path/gsdl/etc/main.cfg
 
+echo "Unpacking perllib/XML-Parser.tar.gz into $distribution_path/gsdl/perllib/cpan..."
+cp perllib/XML-Parser.tar.gz $distribution_path/gsdl/perllib/cpan
+pushd $distribution_path/gsdl/perllib/cpan
+tar xzf XML-Parser.tar.gz
+rm XML-Parser.tar.gz
+popd
+
 echo "Tarring up $distribution..."
 pushd $distribution_path/..

trunk/gsdl/bin/script/create_distributions.pl

@@ -157 +157 @@
     # JAR up the gli, then clean up the class files
     print STDERR "jarring gli...\n";
-    chdir(&util::filename_cat($tmpdir, "gsdl", "gli", "classes"));
-    `jar cvfm ../GLI.jar META-INF/MANIFEST.MF *.properties images/ org/`;
-    chdir(&util::filename_cat($tmpdir, "gsdl", "gli"));
+    `makejar.sh`;
+    &util::rm_r(&util::filename_cat($tmpdir, "gsdl", "gli", "jar"));
     `clean.sh`;
 
@@ -287 +286 @@
     &util::cp(&util::filename_cat($docdir, "COPYING"), $gsdldir);
 
+    # We shouldn't distribute the GLI applet signed by us
+    &util::rm (&util::filename_cat ($source_dist_dir, "gsdl", "bin", "java", "SignedGatherer.jar"));
+
     # Remove the copied "images" and "macros" folders and copy over just the core languages
     my $gsdlimagesdir = &util::filename_cat($source_dist_dir, "gsdl", "images");
@@ -295 +297 @@
     &install_only_core_language_macros(&util::filename_cat($tmpdir, "gsdl", "macros"), $gsdlmacrosdir);
 
-    # We don't want the compiled GLI classes in the source distribution (or the GS3 script)
+    # We don't want the compiled GLI classes in the source distribution (or the GS3 scripts)
+    &util::rm(&util::filename_cat($source_dist_dir, "gsdl", "gli", ".greenstonestore"));
     &util::rm(&util::filename_cat($source_dist_dir, "gsdl", "gli", "GLI.jar"));
+    &util::rm(&util::filename_cat($source_dist_dir, "gsdl", "gli", "gli4gs3.bat"));
     &util::rm(&util::filename_cat($source_dist_dir, "gsdl", "gli", "gli4gs3.sh"));
+    &util::rm_r(&util::filename_cat($source_dist_dir, "gsdl", "gli", "src", "org", "greenstone", "gatherer", "mem"));
+    &util::rm_r(&util::filename_cat($source_dist_dir, "gsdl", "gli", "src", "org", "greenstone", "gatherer", "msm"));
+    &util::rm_r(&util::filename_cat($source_dist_dir, "gsdl", "gli", "src", "org", "greenstone", "gatherer", "valuetree"));
 
     # Make sure there is a dictionary_en.properties to prevent GLI problems
@@ -411 +418 @@
     &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "etc"), $gsdldir);
 
+    # We shouldn't distribute the GLI applet signed by us
+    &util::rm (&util::filename_cat ($gsdlbindir, "java", "SignedGatherer.jar"));
+
     my $gsdlimagesdir = &util::filename_cat ($gsdldir, "images");
     &install_only_core_language_images(&util::filename_cat($tmpdir, "gsdl", "images"), $gsdlimagesdir);
     # ...and garish images
     &util::cp_r(&util::filename_cat($tmpdir, "gsdl", "images", "garish"), $gsdlimagesdir);
-    # &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "images"), $gsdldir);
 
     my $gsdlmacrosdir = &util::filename_cat ($gsdldir, "macros");
     &install_only_core_language_macros(&util::filename_cat($tmpdir, "gsdl", "macros"), $gsdlmacrosdir);
-    # &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "macros"), $gsdldir);
 
     &util::cp_r (&util::filename_cat ($tmpdir, "gsdl", "mappings"), $gsdldir);
@@ -523 +531 @@
     my $document_sh = &util::filename_cat($gli_dir, "document.sh");
     `chmod a+x $document_sh`;
+    my $gems_sh = &util::filename_cat($gli_dir, "gems.sh");
+    `chmod a+x $gems_sh`;
     my $gli_sh = &util::filename_cat($gli_dir, "gli.sh");
     `chmod a+x $gli_sh`;
     my $makegli_sh = &util::filename_cat($gli_dir, "makegli.sh");
     `chmod a+x $makegli_sh`;
+    my $makejar_sh = &util::filename_cat($gli_dir, "makejar.sh");
+    `chmod a+x $makejar_sh`;
 
     # Make sure there is a dictionary_en.properties to prevent GLI problems
@@ -533 +545 @@
 
     # Remove unwanted stuff - all distributions
+    &util::rm(&util::filename_cat($gli_dir, ".greenstonestore"));
     &util::rm_r(&util::filename_cat($gli_dir, "buglist"));
     &util::rm_r(&util::filename_cat($gli_dir, "prototype"));
-
-    # Don't need Greenstone 3 script
+    &util::rm_r(&util::filename_cat($gli_dir, "src", "org", "greenstone", "gatherer", "mem"));
+    &util::rm_r(&util::filename_cat($gli_dir, "src", "org", "greenstone", "gatherer", "msm"));
+    &util::rm_r(&util::filename_cat($gli_dir, "src", "org", "greenstone", "gatherer", "valuetree"));
+
+    # Don't need Greenstone 3 scripts
+    &util::rm(&util::filename_cat($gli_dir, "gli4gs3.bat"));
     &util::rm(&util::filename_cat($gli_dir, "gli4gs3.sh"));
 
@@ -544 +561 @@
     &util::rm(&util::filename_cat($gli_dir, "clean.bat"));
     &util::rm(&util::filename_cat($gli_dir, "document.bat"));
+    &util::rm(&util::filename_cat($gli_dir, "gems.bat"));
     &util::rm(&util::filename_cat($gli_dir, "gli.bat"));
     &util::rm(&util::filename_cat($gli_dir, "makegli.bat"));
@@ -564 +582 @@
     &util::rm(&util::filename_cat($gli_dir, "clean.sh"));
     &util::rm(&util::filename_cat($gli_dir, "document.sh"));
+    &util::rm(&util::filename_cat($gli_dir, "gems.sh"));
     &util::rm(&util::filename_cat($gli_dir, "gli.sh"));
     &util::rm(&util::filename_cat($gli_dir, "makegli.sh"));
+    &util::rm(&util::filename_cat($gli_dir, "makejar.sh"));
     }
 }
@@ -649 +669 @@
     `chmod -R a+x $linuxbindir`;
 
+    # remove the non-static mgquery_old program from distributions
+    &util::rm(&util::filename_cat($linuxbindir, "mgquery_old"));
+    
     # make sure there aren't any CVS directories laying around
     &remove_cvs_dirs ($unixdir);