Changeset 1951

Timestamp:

11/07/08 10:32:13

Author:

douglm

Message:

Changes to the build process an adding some install scripts

Files:

• trunk (modified) (1 prop)
• trunk/build.properties (modified) (2 diffs)
• trunk/build.xml (modified) (19 diffs)
• trunk/build/buildjar.xml (modified) (2 diffs)
• trunk/build/getJar.xml (modified) (1 diff)
• trunk/build/quickstart/install.xml (modified) (4 diffs)
• trunk/build/quickstart/linux/install (added)
• trunk/build/quickstart/run-dir.xml (modified) (1 diff)
• trunk/deployment/appjars.xml (modified) (1 diff)

trunk/build.properties

@@ -1 +1 @@
-#
-
+t
-#
-
@@ -7 +7 @@
-
-# Version we are building
-4
+5
-
-# Name of generated jar files

trunk/build.xml

@@ -15 +15 @@
-  <property name="org.bedework.project.bedework"
-            location="${basedir}" />
+
+    <property name="org.bedework.libcache.dir"
+              location="${org.bedework.project.bedework}/libcache"/>
-
-  <!-- Where we put other projects -->
@@ -136 +139 @@
-    <property name="buildwar" location="${build.dir}/buildwar.xml"/>
-
-    <property name="org.bedework.libcache.dir"
-              location="${project.home}/libcache"/>
-
-    <property name="org.bedework.build.caldav" value="yes" />
-
@@ -395 +395 @@
-          description="builds the access project">
-    <ant antfile="${org.bedework.project.access}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -413 +416 @@
-          description="builds the bwtools project">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -430 +436 @@
-  <target name="build.caldav" depends="init"
-          description="builds the caldav project">
-
-
-
-
-
-
-
+
+
+
+
+
-  </target>
-
-  <target name="clean.caldav" depends="init"
-          description="clean the caldav project">
-
-
-
-
-
-
-
+
+
-  </target>
-
@@ -458 +457 @@
-  <target name="build.caldavTest" depends="init"
-          description="builds the caldavTest project">
-
-
-
-
-
-
-
+
+
+
+
+
-  </target>
-
-  <target name="clean.caldavTest" depends="init"
-          description="clean the caldavTest project">
-
-
-
-
-
-
-
+
+
-  </target>
-
@@ -487 +479 @@
-          description="builds the calendar project">
-    <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -505 +500 @@
-          description="builds the davutil project">
-    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -523 +521 @@
-          description="builds the dumprestore project">
-    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -544 +545 @@
-      <then>
-        <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false"
-
+
+
+
+
-      </then>
-    </if>
@@ -569 +573 @@
-          description="builds the rpiutil project">
-    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -590 +597 @@
-      <then>
-        <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false"
-
+
+
+
+
-      </then>
-    </if>
@@ -615 +625 @@
-          description="builds the testsuite project">
-    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -633 +646 @@
-          description="builds the webapps project">
-    <ant antfile="${org.bedework.project.webapps}/build.xml" inheritall="false"
-
+
+
+
+
-  </target>
-
@@ -650 +666 @@
-  <target name="build.webdav" depends="init"
-          description="builds the webdav project">
-
-
-
-
-
-
-
+
+
+
+
+
-  </target>
-
-  <target name="clean.webdav" depends="init"
-          description="cleans the webdav project">
-
-
-
-
-
-
-
+
+
-  </target>
-
@@ -697 +706 @@
-        <propertyref prefix="org.bedework.directory."/>
-      </propertyset>
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
+    </antfetch>
+  </target>
+
+  <target name="initDirForQuickstart" depends="init"
+          description="Build and run directory tool to initialise a quickstart system">
+    <antfetch antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
+              target="initDirForQuickstart"
+              return="org.bedework.directory.init.status" >
+      <propertyset>
+        <propertyref prefix="org.bedework.directory."/>
+      </propertyset>
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
-    </antfetch>
-  </target>
@@ -707 +731 @@
-        <propertyref prefix="org.bedework.directory."/>
-      </propertyset>
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
@@ -717 +743 @@
-        <propertyref prefix="org.bedework.directory."/>
-      </propertyset>
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
@@ -727 +755 @@
-        <propertyref prefix="org.bedework.directory."/>
-      </propertyset>
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>

trunk/build/buildjar.xml

@@ -85 +85 @@
-        <echo message="**** ${build.jar.file} is up to date" />
-      </then>
-
-
-
-
-
-
-
+
-        <echo message="**** ${build.jar.file} needs rebuilding" />
-
@@ -147 +141 @@
-        <delete dir="${jar.temp.sources}" />
-        <delete dir="${jar.temp.classes}"/>
-then
+else
-    </if>
-  </target>

trunk/build/getJar.xml

@@ -28 +28 @@
-    <attribute name="src" default="http://bedework.org/downloads/lib"/>
-    <attribute name="lib" default="${lib.dir}"/>
-@{lib}/../libcache
+${org.bedework.libcache.dir}
-    <attribute name="property" default="" />
-    <attribute name="project" default="" />

trunk/build/quickstart/install.xml

@@ -78 +78 @@
-      <sequential>
-        <sleep seconds="10" />
-
+ForQuickstart
-                     return="org.bedework.directory.init.status" />
-        <if>
@@ -92 +92 @@
-              <echo message="The directory appears to be initialised already" />
-              <echo message="========================================================" />
-
-              <input message="Continue with adding users/groups? yes/no"
-                     addproperty="org.bedework.install.dirinit.reply" />
-              <echo message="" />
-            </then>
-          </elseif>
@@ -102 +98 @@
-
-          </else>
-        </if>
-
-        <if>
-          <equals arg1="${org.bedework.install.dirinit.reply}" arg2="yes" />
-          <then>
-            <echo message="======== super user info =======" />
-
-            <input message="Account name for superuser"
-                   defaultvalue="caladmin"
-                   addproperty="org.bedework.install.superuser.account" />
-
-            <input message="Account password for superuser"
-                   addproperty="org.bedework.install.superuser.password" />
-
-            <echo message="======== Administrative user info =======" />
-
-            <input message="Account name for an administrative user"
-                   defaultvalue="calowner01"
-                   addproperty="org.bedework.install.admin.account" />
-
-            <input message="Account password for an administrative user"
-                   addproperty="org.bedework.install.admin.password" />
-
-            <echo message="======== personal calendar user info =======" />
-
-            <input message="Account name for a test user"
-                   defaultvalue="testuser01"
-                   addproperty="org.bedework.install.testuser.account" />
-
-            <input message="Account password for test user"
-                   addproperty="org.bedework.install.testuser.password" />
-
-            <echo message="======== Create superuser =======" />
-
-            <addBedeworkUser account="${org.bedework.install.superuser.account}"
-                             firstName="first"
-                             lastName="last"
-                             password="${org.bedework.install.superuser.account}" />
-
-            <echo message="======== Create administrative user =======" />
-
-            <addBedeworkUser account="${org.bedework.install.admin.account}"
-                             firstName="first"
-                             lastName="last"
-                             password="${org.bedework.install.admin.account}" />
-
-            <echo message="======== Create personal calendar user =======" />
-
-            <addBedeworkUser account="${org.bedework.install.testuser.account}"
-                             firstName="first"
-                             lastName="last"
-                             password="${org.bedework.install.testuser.account}" />
-          </then>
-        </if>
-
@@ -177 +120 @@
-  </target>
-
+  <target name="getUserInfo">
+    <input message="Account name:"
+           addproperty="org.bedework.install.user.account" />
+
+    <input message="First name:"
+           defaultValue="First"
+           addproperty="org.bedework.install.user.firstname" />
+
+    <input message="Last name:"
+           defaultValue="Last"
+           addproperty="org.bedework.install.user.lastname" />
+
+    <input message="Account password:"
+           addproperty="org.bedework.install.user.password" />
+
+    <var name="org.bedework.install.user.info"
+         value="${org.bedework.install.user.account}" />
+
+    <var name="org.bedework.install.user.info"
+         value="${org.bedework.install.user.info} ${org.bedework.install.user.firstname}" />
+
+    <var name="org.bedework.install.user.info"
+         value="${org.bedework.install.user.info} ${org.bedework.install.user.lastname}" />
+
+    <var name="org.bedework.install.user.info"
+         value="${org.bedework.install.user.info} ${org.bedework.install.user.password}" />
+  </target>
+
-  <macrodef name="initDirectory">
-    <sequential>

trunk/build/quickstart/run-dir.xml

@@ -82 +82 @@
-  </target>
-
+  <target name="initDirForQuickstart" depends="run.init"
+          description="Build and run directory init">
+    <antfetch antfile="${bedework.build.file}" inheritrefs="true"
+              target="initDirForQuickstart"
+              return="org.bedework.directory.init.status" />
+  </target>
+
-  <target name="addUser" depends="run.init"
-          description="Build and run directory tools to add a user">

trunk/deployment/appjars.xml

@@ -211 +211 @@
-
-      <getJar lib="${org.bedework.app.lib}"
+              name="bw-tools" version="3.5"
+              projecthome="${project.home}/projects/bwtools" />
+
+      <getJar lib="${org.bedework.app.lib}"
-              name="rpiutil" version="3.5"
-              projecthome="${project.home}/projects/rpiutil" />