Changeset 16496

Timestamp:

2008-07-21T15:46:23+12:00 (16 years ago)

Author:

ak19

Message:

prepare-gs2building also downloads gliserver.pl and gsdlCGI.pm from gsdl's trunk, no longer just svnupdate-gs2building which doesn't get executed during the normal ant prepare step

Location:

greenstone3/trunk

Files:

• build.properties (modified) (1 diff)
• build.xml (modified) (1 diff)
• lib/java/anttasks.jar (modified) ( previous)
• src/packages/javagdbm/jni/GdbmFile.h (modified) (1 diff)
• web/WEB-INF/cgi/gsdl3site.cfg (modified) (2 diffs)

greenstone3/trunk/build.properties

@@ -18 +18 @@
 ## Tomcat installation
 #Set this to the internet/intranet name of the machine that Tomcat is/will be run on. localhost is fine for accessing the server from the local machine, but not remotely
-tomcat.server=localhost
+tomcat.server=wharariki
 # The port number that tomcat is/will be run on
-tomcat.port=8080
+tomcat.port=9100
 # Tomcat's shutdown port - this may need to be changed if you are running two or more Tomcats
-tomcat.shutdown.port=8005
+tomcat.shutdown.port=9105
 # If tomcat is already running, enter the path to the base directory here
 tomcat.installed.path=

greenstone3/trunk/build.xml

@@ -1392 +1392 @@
       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml" revision="${branch.revision}"/>
 
+       <!-- some files from cgi-bin: necessary for remote GLI server  -->
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl" destPath="${web.home}/WEB-INF/cgi/gliserver.pl" revision="${branch.revision}"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm" destPath="${web.home}/WEB-INF/cgi/gsdlCGI.pm" revision="${branch.revision}"/>
+
+
       <!-- some files from the gsdl root directory -->
       <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash" revision="${branch.revision}"/>

greenstone3/trunk/src/packages/javagdbm/jni/GdbmFile.h

@@ -118 +118 @@
 #endif
 #endif
+/* Header for class au_com_pharos_gdbm_GdbmFile_KeyEnumeration */
+
+#ifndef _Included_au_com_pharos_gdbm_GdbmFile_KeyEnumeration
+#define _Included_au_com_pharos_gdbm_GdbmFile_KeyEnumeration
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif

greenstone3/trunk/web/WEB-INF/cgi/gsdl3site.cfg

@@ -6 +6 @@
 # GSDL3HOME is optional, set it if your Greenstone web folder
 # is located somewhere other than the default gsdl3srchome/web
-gsdl3srchome    /full/path/to/greenstone3
-gsdlhome    /full/path/to/greenstone3/gs2build
-#gsdl3home /full/path/to/greenstone3/web
+gsdl3srchome    /research/ak19/gs3-server-svn
+gsdlhome    /research/ak19/gs3-server-svn/gs2build
+#gsdl3home /research/ak19/gs3-server-svn/gs2build/web
 
 
@@ -24 +24 @@
 # full path to FEDORA_HOME, and the major version number of the
 # fedora installation
-#fedorahome /full/path/to/fedora
+#fedorahome /research/ak19/fedora
 #fedoraversion 2