Changeset 16496

Show
Ignore:
Timestamp:
21.07.2008 15:46:23 (11 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:
5 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.properties

    r15858 r16496  
    1818## Tomcat installation 
    1919#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 
    20 tomcat.server=localhost 
     20tomcat.server=wharariki 
    2121# The port number that tomcat is/will be run on 
    22 tomcat.port=8080 
     22tomcat.port=9100 
    2323# Tomcat's shutdown port - this may need to be changed if you are running two or more Tomcats 
    24 tomcat.shutdown.port=8005 
     24tomcat.shutdown.port=9105 
    2525# If tomcat is already running, enter the path to the base directory here 
    2626tomcat.installed.path= 
  • greenstone3/trunk/build.xml

    r16478 r16496  
    13921392      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml" revision="${branch.revision}"/> 
    13931393 
     1394       <!-- some files from cgi-bin: necessary for remote GLI server  --> 
     1395      <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gliserver.pl" destPath="${web.home}/WEB-INF/cgi/gliserver.pl" revision="${branch.revision}"/> 
     1396      <export srcUrl="${svn.root}/gsdl/${branch.path}/cgi-bin/gsdlCGI.pm" destPath="${web.home}/WEB-INF/cgi/gsdlCGI.pm" revision="${branch.revision}"/> 
     1397 
     1398 
    13941399      <!-- some files from the gsdl root directory --> 
    13951400      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash" revision="${branch.revision}"/> 
  • greenstone3/trunk/src/packages/javagdbm/jni/GdbmFile.h

    r15149 r16496  
    118118#endif 
    119119#endif 
     120/* Header for class au_com_pharos_gdbm_GdbmFile_KeyEnumeration */ 
     121 
     122#ifndef _Included_au_com_pharos_gdbm_GdbmFile_KeyEnumeration 
     123#define _Included_au_com_pharos_gdbm_GdbmFile_KeyEnumeration 
     124#ifdef __cplusplus 
     125extern "C" { 
     126#endif 
     127#ifdef __cplusplus 
     128} 
     129#endif 
     130#endif 
  • greenstone3/trunk/web/WEB-INF/cgi/gsdl3site.cfg

    r16416 r16496  
    66# GSDL3HOME is optional, set it if your Greenstone web folder 
    77# is located somewhere other than the default gsdl3srchome/web 
    8 gsdl3srchome    /full/path/to/greenstone3 
    9 gsdlhome    /full/path/to/greenstone3/gs2build 
    10 #gsdl3home /full/path/to/greenstone3/web 
     8gsdl3srchome    /research/ak19/gs3-server-svn 
     9gsdlhome    /research/ak19/gs3-server-svn/gs2build 
     10#gsdl3home /research/ak19/gs3-server-svn/gs2build/web 
    1111 
    1212 
     
    2424# full path to FEDORA_HOME, and the major version number of the 
    2525# fedora installation 
    26 #fedorahome /full/path/to/fedora 
     26#fedorahome /research/ak19/fedora 
    2727#fedoraversion 2