From 1611d75c3ccd19bceda86043f281c96d22298ee6 Mon Sep 17 00:00:00 2001
From: zumbrunn <chris@zumbrunn.com>
Date: Mon, 24 Apr 2006 08:44:13 +0000
Subject: [PATCH] changed apps.properties and the build script to include
 "modules" instead of helmaLib

---
 build/build.xml            | 19 ++-----------------
 build/main/apps.properties |  3 +--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 28dc7ba4..505e111c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -324,26 +324,11 @@
 
 
     <!-- =================================================================== -->
-    <!-- Checkout modules, put them in work directory and zip them           -->
+    <!-- Checkout modules, and include helmaTools                            -->
     <!-- =================================================================== -->
     <target name="package-modules" depends="init">
-
-        <mkdir dir="${build.work}/modules" />
-
-        <antcall target="package-helmaLib" />
+        <cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="modules" dest="${build.work}" />
         <antcall target="package-helmaTools" />
-
-    </target>
-
-
-    <!-- =================================================================== -->
-    <!-- Checkout and zip helmaLib                                           -->
-    <!-- =================================================================== -->
-    <target name="package-helmaLib" depends="init">
-        <cvs cvsRoot="${cvs.root.apps}" command="export" tag="${cvs.apps.tag}" package="helmaLib" dest="${build.work}" />
-        <mkdir dir="${build.work}/modules"/>
-        <zip zipfile="${build.work}/modules/helmaLib.zip" basedir="${build.work}/helmaLib/" includes="**" excludes="**/*.txt, **/*.html, **/*.bat, **/*.sh" />
-        <delete dir="${build.work}/helmaLib" />
     </target>
 
 
diff --git a/build/main/apps.properties b/build/main/apps.properties
index 4e45b417..29e919da 100644
--- a/build/main/apps.properties
+++ b/build/main/apps.properties
@@ -14,9 +14,8 @@ manage
 
 welcome
 welcome.mountpoint = /
-welcome.repository.0 = modules/helmaLib.zip
+welcome.repository.0 = apps/welcome/code/
 welcome.repository.1 = modules/helmaTools.zip
-welcome.repository.2 = apps/welcome/code/
 welcome.static = apps/welcome/static
 welcome.staticMountpoint = /static
 welcome.staticHome = index.html,default.html