Print

Print


Commit in lcsim on MAIN
pom.xml+34-41.53 -> 1.54
JM: unzip deps at end of build; clean lib dir; use properties for some complex expressions that might be reused

lcsim
pom.xml 1.53 -> 1.54
diff -u -r1.53 -r1.54
--- pom.xml	31 Oct 2008 18:03:43 -0000	1.53
+++ pom.xml	31 Oct 2008 19:25:03 -0000	1.54
@@ -45,10 +45,16 @@
             <url>scp://noric.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/software/lcsim/</url>
         </site>
     </distributionManagement>
+    <properties>
+        <lcsim.depsjar>${project.build.directory}/${project.artifactId}-${project.version}-deps.zip</lcsim.depsjar>
+        <lcsim.filterfile>${project.build.directory}/filter.properties</lcsim.filterfile>
+        <lcsim.mainclass>org.lcsim.job.JobControlManager</lcsim.mainclass>
+        <lcsim.assemblyfile>${basedir}/src/assembly/deps.xml</lcsim.assemblyfile>
+    </properties>
     <build>
         <defaultGoal>install</defaultGoal>
         <filters>
-            <filter>${basedir}/target/filter.properties</filter>
+            <filter>${lcsim.filterfile}</filter>
         </filters>
         <resources>
             <resource>
@@ -121,7 +127,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>org.lcsim.job.JobControlManager</mainClass>
+                            <mainClass>${lcsim.mainclass}</mainClass>
                             <packageName>org.lcsim</packageName>
                         </manifest>
                     </archive>
@@ -134,7 +140,7 @@
                         <phase>package</phase>
                         <configuration>
                             <descriptors>
-                                <descriptor>${basedir}/src/assembly/deps.xml</descriptor>
+                                <descriptor>${lcsim.assemblyfile}</descriptor>
                             </descriptors>
                         </configuration>
                         <goals>
@@ -159,7 +165,7 @@
                                 <tstamp>
                                     <format property="last.updated" pattern="yyyy-MM-dd kk:mm:ss z" /> 
                                 </tstamp>
-                                <echo file="${basedir}/target/filter.properties" message="build.date=${last.updated}" />
+                                <echo file="${lcsim.filterfile}" message="build.date=${last.updated}" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -175,6 +181,30 @@
                             </tasks>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unzip-deps</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <unzip src="${lcsim.depsjar}" dest="${basedir}" overwrite="true" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>clean-lib-dir</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <delete dir="${basedir}/lib"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>            
         </plugins>
CVSspam 0.2.8