Changeset 36129 for main

Timestamp:

2022-04-05T14:28:52+12:00 (2 years ago)

Author:

kjdon

Message:

because greenstone3.xml (if you are using the latest one from svn) uses GoogleSigninJDBCRealm whether we have enabled googlesignin or not (if no google sign in it defaults to old authentication method), I have removed all the tests for googlesignin enabled in build.xml - we always want to regenerate the googlesignin realm jar file

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -3336 +3336 @@
     <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
 
-    <if>
-      <bool><istrue value="${googlesignin.enabled}"/></bool>
-      <antcall target="googlesignin-jar-with-dependencies" />
+     <antcall target="googlesignin-jar-with-dependencies" />
       <copy file="${build.home}/googlesignin-jdbcrealm.jar" todir="${catalina.home}/lib"/>
-    </if>
+
     <jar destfile="${build.home}/gutil.jar">
       <fileset dir="${build.home}">
@@ -3422 +3420 @@
   </target>
 
-  <target name="googlesignin-checkforchanges" if="${googlesignin.enabled}">
+  <target name="googlesignin-checkforchanges" >
     <uptodate property="googlesignin-nochanges" targetfile="${build.home}/googlesignin-jdbcrealm.jar">
       <srcfiles dir="${build.home}" includes="org/greenstone/gsdl3/GoogleSigninJDBCRealm.class"/>
     </uptodate>
   </target>
-  
-  <target name="googlesignin-jar-with-dependencies" depends="init,googlesignin-checkforchanges" unless="googlesignin-nochanges" if="${googlesignin.enabled}">
+
+  <target name="googlesignin-jar-with-dependencies" depends="init,googlesignin-checkforchanges" unless="googlesignin-nochanges">
     <path id="googlesignin-jar-dependencies">
       <fileset dir="${web.lib}">