Changeset 25830

Timestamp:

2012-06-27T13:55:56+12:00 (11 years ago)

Author:

sjm84

Message:

gsdl3site.cfg will now have its content automatically added by the configure-web target of the main build.xml file

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (2 diffs)
• web/WEB-INF/cgi/gsdl3site.cfg.in (moved) (moved from main/trunk/greenstone3/web/WEB-INF/cgi/gsdl3site.cfg ) (1 diff)

main/trunk/greenstone3/build.xml

@@ -910 +910 @@
     </stringutil>
     
+    <filter token="gsdlhome" value="${gs2build.home}"/>
+    <filter token="gsdl3srchome" value="${basedir}"/>
     <filter token="gsdl3home" value="${src.gsdl3.home.unix}"/>
     <filter token="gsdl3version" value="${app.version}"/>
@@ -916 +918 @@
     <filter token="perlpath" value="${escaped.perl.path}"/>
     <filter token="disable.collection.building" value="${disable.collection.building}"/>
+    <copy file="${basedir}/web/WEB-INF/cgi/gsdl3site.cfg.in" tofile="${basedir}/web/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/>
     <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.classes}/global.properties" filtering="true" overwrite="true"/>
     <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.classes}/log4j.properties" filtering="true" overwrite="true"/>

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

@@ -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
+gsdl3srchome @gsdl3srchome@
+gsdlhome @gsdlhome@
 #gsdl3home /full/path/to/greenstone3/web