|
Added
Link Here
|
| 1 |
--- jasperserver/buildomatic/bin/dev.xml.orig 2011-03-14 02:07:47.000000000 -0700 |
| 2 |
+++ jasperserver/buildomatic/bin/dev.xml 2011-03-14 02:15:47.000000000 -0700 |
| 3 |
@@ -44,6 +44,7 @@ |
| 4 |
<exec executable="${maven}" dir="@{dir}" failonerror="true"> |
| 5 |
<env key="MAVEN_OPTS" value="-Xms128m -Xmx512m -XX:PermSize=32m -XX:MaxPermSize=128m"/> |
| 6 |
<arg value="-s"/> |
| 7 |
+ <arg value="-o"/> |
| 8 |
<arg value="${currentConf}/maven_settings.xml"/> |
| 9 |
<!-- <arg value="-e"/> --> <!-- ERROR INFO MODE --> |
| 10 |
<!-- <arg value="-X"/> --> <!-- DETAILED DEBUG MODE --> |
| 11 |
@@ -111,16 +112,6 @@ |
| 12 |
</sequential> |
| 13 |
</macrodef> |
| 14 |
|
| 15 |
- <macrodef name="runsvn"> |
| 16 |
- <attribute name="dir" default="${buildBase}"/> |
| 17 |
- <element name="args" implicit="yes"/> |
| 18 |
- <sequential> |
| 19 |
- <exec executable="${svn}" dir="@{dir}" failonerror="true"> |
| 20 |
- <args/> |
| 21 |
- </exec> |
| 22 |
- </sequential> |
| 23 |
- </macrodef> |
| 24 |
- |
| 25 |
<macrodef name="run-export-test"> |
| 26 |
<attribute name="edition" /> |
| 27 |
<sequential> |
| 28 |
@@ -161,6 +152,7 @@ |
| 29 |
<arg value="-Dversion=${maven.jdbc.version}"/> |
| 30 |
<arg value="-Dpackaging=jar"/> |
| 31 |
<arg value="-Dfile=${currentDbDir}/jdbc/${jdbcJar}"/> |
| 32 |
+ <arg value="-o"/> |
| 33 |
<!-- <arg value="-o"/> --> <!-- OFFLINE MODE --> |
| 34 |
</runmaven> |
| 35 |
</target> |
| 36 |
@@ -242,102 +234,6 @@ |
| 37 |
<echo> </echo> |
| 38 |
</target> |
| 39 |
|
| 40 |
- <target name="test-svn" |
| 41 |
- depends="init-source-paths" |
| 42 |
- description="test svn"> |
| 43 |
- <echo>Testing svn...</echo> |
| 44 |
- <runsvn> |
| 45 |
- <arg value="list"/> |
| 46 |
- <arg value="${js-url}"/> |
| 47 |
- </runsvn> |
| 48 |
- <!-- echo>open source working directory: ${js-path}</echo> |
| 49 |
- <echo>pro working directory: ${js-path}</echo> |
| 50 |
- --> |
| 51 |
- </target> |
| 52 |
- |
| 53 |
- <target name="checkout-ce" |
| 54 |
- depends="init-source-paths" |
| 55 |
- description="svn checkout os"> |
| 56 |
- <runsvn> |
| 57 |
- <arg value="co"/> |
| 58 |
- <arg value="${js-url}"/> |
| 59 |
- <arg value="${js-path}"/> |
| 60 |
- </runsvn> |
| 61 |
- </target> |
| 62 |
- |
| 63 |
- <target name="checkout-ce-anon" |
| 64 |
- depends="init-source-paths" |
| 65 |
- description="svn checkout os"> |
| 66 |
- <runsvn> |
| 67 |
- <arg value="co"/> |
| 68 |
- <arg line="--username anonsvn --password anonsvn"/> |
| 69 |
- <arg value="${js-url}"/> |
| 70 |
- <arg value="${js-path}"/> |
| 71 |
- </runsvn> |
| 72 |
- </target> |
| 73 |
- |
| 74 |
- <target name="checkout-pro" |
| 75 |
- depends="init-source-paths" |
| 76 |
- description="svn checkout pro"> |
| 77 |
- <runsvn> |
| 78 |
- <arg value="co"/> |
| 79 |
- <arg value="${js-pro-url}"/> |
| 80 |
- <arg value="${js-pro-path}"/> |
| 81 |
- </runsvn> |
| 82 |
- </target> |
| 83 |
- |
| 84 |
- <target name="checkout-repo" |
| 85 |
- depends="init-source-paths" |
| 86 |
- description="svn checkout repo"> |
| 87 |
- <runsvn> |
| 88 |
- <arg value="co"/> |
| 89 |
- <arg value="${repo-url}"/> |
| 90 |
- <arg value="${repo-path}"/> |
| 91 |
- </runsvn> |
| 92 |
- </target> |
| 93 |
- |
| 94 |
- <target name="update-all" |
| 95 |
- depends="update-ce,update-pro,update-repo" |
| 96 |
- description="svn update of ce src, pro src, and js-repo"> |
| 97 |
- </target> |
| 98 |
- |
| 99 |
- <target name="update-ce" |
| 100 |
- depends="init-source-paths" |
| 101 |
- description="svn update os"> |
| 102 |
- <runsvn dir="${js-path}"> |
| 103 |
- <arg value="update"/> |
| 104 |
- </runsvn> |
| 105 |
- </target> |
| 106 |
- |
| 107 |
- <target name="update-pro" |
| 108 |
- depends="init-source-paths" |
| 109 |
- description="svn update pro"> |
| 110 |
- <runsvn dir="${js-pro-path}"> |
| 111 |
- <arg value="update"/> |
| 112 |
- </runsvn> |
| 113 |
- </target> |
| 114 |
- |
| 115 |
- <target name="update-repo" |
| 116 |
- depends="init-source-paths" |
| 117 |
- description="svn update repo"> |
| 118 |
- <if> |
| 119 |
- <!-- if we have repo-rev set, then that means we do not want to automatically --> |
| 120 |
- <!-- update our jasperserver-repo local source. If we update we will get HEAD revision. --> |
| 121 |
- <!-- in this case, if you want to update jasperserver-repo, do it manually --> |
| 122 |
- |
| 123 |
- <isset property="repo-rev"/> |
| 124 |
- <then> |
| 125 |
- <echo>INFO: Using repo revision, skipping update: </echo> |
| 126 |
- <echo>INFO: repo-url = ${repo-url}</echo> |
| 127 |
- </then> |
| 128 |
- <else> |
| 129 |
- <runsvn dir="${repo-path}"> |
| 130 |
- <arg value="update"/> |
| 131 |
- </runsvn> |
| 132 |
- </else> |
| 133 |
- </if> |
| 134 |
- </target> |
| 135 |
- |
| 136 |
<target name="build-src-all" |
| 137 |
depends="build-ce, build-pro" |
| 138 |
description="Builds JasperServer CE/Pro and copies WAR files to install resources"> |
| 139 |
@@ -549,7 +445,7 @@ |
| 140 |
</target> |
| 141 |
|
| 142 |
<target name="build-all" |
| 143 |
- depends="update-all,build-all-no-svn" |
| 144 |
+ depends="build-all-no-svn" |
| 145 |
description="update all src, clean build all src, drop-recreate db, build ddl pro, init db pro, run unit test pro"> |
| 146 |
</target> |
| 147 |
|
| 148 |
@@ -569,7 +465,7 @@ |
| 149 |
</target> |
| 150 |
|
| 151 |
<target name="update-build-all" |
| 152 |
- depends="update-repo, update-ce, update-pro, build-ce, build-pro" |
| 153 |
+ depends="build-ce, build-pro" |
| 154 |
description="update and build os and pro"/> |
| 155 |
|
| 156 |
<target name="clean-pro-unit-test" |