Changeset 1537
- Timestamp:
- 05/11/07 20:36:04 (19 months ago)
- Location:
- branches/build_changes
- Files:
-
- 9 modified
-
build.xml (modified) (4 diffs)
-
components/antlib/resources/global.xml (modified) (1 diff)
-
components/antlib/resources/lifecycle.xml (modified) (1 diff)
-
components/blitz/resources/OMERO/API.ice (modified) (1 diff)
-
components/tools/OmeroCpp/build.xml (modified) (3 diffs)
-
components/tools/OmeroCpp/src/Makefile.am (modified) (1 diff)
-
components/tools/autogen.sh (modified) (1 diff)
-
components/tools/build.xml (modified) (2 diffs)
-
components/tools/licenses/build.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/build_changes/build.xml
r1532 r1537 43 43 <!-- Multiproject: 44 44 The idea for these targets is taken from maven2 and is 45 supported by the antlib/resources/lifecycle.xml ant script.45 supported by the ${import.dir}/lifecycle.xml ant script. 46 46 Unlike most other targets which can be called from anywhere, 47 47 these targets can only be called from the top-level because … … 100 100 </macrodef> 101 101 102 <target name="multiproject" depends="compatibility,init"/> 102 <!-- =============================================== 103 BUILD 104 ================================================== --> 105 <target name="fullbuild" depends="check-system,clean,build,reload-db" 106 description="Extensive build which checks and cleans the build environment, builds, and setups the database"/> 107 108 <target name="build" depends="dsl,model,install" 109 description="A simple build that will install all artifacts to ${omero.repo.local}"/> 110 111 <target name="withtools" 112 description="Calls build and dist on the tools component, copying over dist/"> 113 <antRun component="tools"> 114 <target name="build"/> 115 <target name="dist"/> 116 </antRun> 117 </target> 118 119 <target name="build-client" depends="check-system,model"> 120 <antRun component="common"><target name="install"/></antRun> 121 <antRun component="client"><target name="install"/></antRun> 122 </target> 123 124 <target name="build-server" depends="check-system,model"> 125 <antRun component="common"><target name="install"/></antRun> 126 <antRun component="romio"><target name="install"/></antRun> 127 <antRun component="rendering"><target name="install"/></antRun> 128 <antRun component="server"><target name="install"/></antRun> 129 </target> 130 131 <target name="deploy" depends="check-system,build-server"> 132 <antRun component="app"> 133 <target name="package"/> 134 <target name="deploy-ear-jboss"/> 135 </antRun> 136 </target> 137 138 <target name="fulldeploy" depends="check-system,build-server,deploy"/> 139 140 141 142 <!-- Special Components --> 143 <property name="defaultTarget" value="install"/> 144 145 <target name="dsl" depends="check-system" unless="generate.skip"> 146 <antRun component="dsl"> 147 <target name="${defaultTarget}"/> 148 </antRun> 149 </target> 150 151 <target name="model" depends="check-system,dsl" unless="generate.skip"> 152 <antRun component="common"> 153 <target name="clean"/> 154 <target name="install"/> 155 </antRun> 156 </target> 157 158 <target name="reload-db"> 159 <antRun component="server"> 160 <target name="reload-db"/> 161 </antRun> 162 </target> 163 164 <target name="addgroup"> 165 <antRun component="client"> 166 <target name="addgroup"/> 167 </antRun> 168 </target> 169 170 <target name="adduser"> 171 <antRun component="client"> 172 <target name="adduser"/> 173 </antRun> 174 </target> 175 176 <target name="multiproject" depends="compatibility,init"/> 103 177 104 178 <target name="multi" depends="multiproject" … … 218 292 219 293 <target name="zip"> 220 <zip destfile=" omero-${omero.version}.zip">221 <zipfileset dir="${dist.dir}" prefix=" omero-${omero.version}"/>294 <zip destfile="${product.name}-${product.version}.zip"> 295 <zipfileset dir="${dist.dir}" prefix="${product.name}-${product.version}"/> 222 296 </zip> 297 </target> 298 299 <target name="tar"> 300 <tar destfile="${product.name}-${product.version}.tar.bz2" compress="bzip2"> 301 <zipfileset dir="${dist.dir}" prefix="${product.name}-${product.version}"/> 302 </tar> 223 303 </target> 224 304 … … 227 307 <delete dir="${dist.dir}"/> 228 308 <iterate target="clean"/> 309 <antRun component="tools"> 310 <target name="clean"/> 311 </antRun> 229 312 </target> 230 313 -
branches/build_changes/components/antlib/resources/global.xml
r1322 r1537 181 181 </target> 182 182 183 <!-- ===============================================184 BUILD185 ================================================== -->186 <target name="fullbuild" depends="check-system,clean,build,reload-db"187 description="Extensive build which checks and cleans the build environment, builds, and setups the database"/>188 189 <target name="build" depends="dsl,model,install"190 description="A simple build that will install all artifacts to ${omero.repo.local}"/>191 192 <!-- Special Components -->193 <property name="defaultTarget" value="install"/>194 195 <target name="dsl" depends="check-system" unless="generate.skip">196 <antRun component="dsl">197 <target name="${defaultTarget}"/>198 </antRun>199 </target>200 201 <target name="model" depends="check-system,dsl" unless="generate.skip">202 <antRun component="common">203 <target name="clean"/>204 <target name="install"/>205 </antRun>206 </target>207 208 <target name="reload-db">209 <antRun component="server">210 <target name="reload-db"/>211 </antRun>212 </target>213 214 <target name="addgroup">215 <antRun component="client">216 <target name="addgroup"/>217 </antRun>218 </target>219 220 <target name="adduser">221 <antRun component="client">222 <target name="adduser"/>223 </antRun>224 </target>225 226 <target name="build-client" depends="check-system,model">227 <antRun component="common"><target name="install"/></antRun>228 <antRun component="client"><target name="install"/></antRun>229 </target>230 231 <target name="build-server" depends="check-system,model">232 <antRun component="common"><target name="install"/></antRun>233 <antRun component="romio"><target name="install"/></antRun>234 <antRun component="rendering"><target name="install"/></antRun>235 <antRun component="server"><target name="install"/></antRun>236 </target>237 238 <target name="deploy" depends="check-system,build-server">239 <antRun component="app">240 <target name="package"/>241 <target name="deploy-ear-jboss"/>242 </antRun>243 </target>244 245 <target name="fulldeploy" depends="check-system,build-server,deploy"/>246 247 183 </project> -
branches/build_changes/components/antlib/resources/lifecycle.xml
r1532 r1537 101 101 <arg value="@{output}"/> 102 102 <arg value="-I${resrc.dest}"/> 103 <arg value="-I${resrc.dir} /slice"/>104 <arg value="-I${blitz.comp}/resources /slice"/>103 <arg value="-I${resrc.dir}"/> 104 <arg value="-I${blitz.comp}/resources"/> 105 105 <arg value="-I${blitz.comp}target/generated/resources"/> 106 106 <arg value="-I@{ice.slice}"/> -
branches/build_changes/components/blitz/resources/OMERO/API.ice
r1521 r1537 30 30 * ome.api argument types and omero::api argument types hold: 31 31 * 32 * 33 * 34 * 35 * 36 * 37 * 38 * 39 * 40 * 41 * 42 * 43 * 44 * 45 */ 32 * +-----------------------+------------------------+ 33 * | ome.api | omero::api | 34 * +-----------------------+------------------------+ 35 * |java.lang.Class |string | 36 * +-----------------------+------------------------+ 37 * |java.util.Set |java.util.List/vector | 38 * +-----------------------+------------------------+ 39 * |IPojo options (Map) |omero::sys::ParamMap | 40 * +-----------------------+------------------------+ 41 * |If null needed |omero::RType subclass | 42 * +-----------------------+------------------------+ 43 * |... |... | 44 * +-----------------------+------------------------+ 45 */ 46 46 module omero { 47 47 -
branches/build_changes/components/tools/OmeroCpp/build.xml
r1532 r1537 6 6 <import file="${classpath.file}"/> 7 7 --> 8 <property name="copy.dir" value="target/temp"/> 9 <target name="clean"> 10 <delete dir="${copy.dir}"/> 11 </target> 8 9 <dirname property="up-two" file="${basedir}"/> 10 <dirname property="up-one" file="${up-two}"/> 11 <property name="copy.dir" value="target/temp"/> 12 13 <property environment="make"/> 14 <property name="make.ICE_HOME" value="/usr/share/Ice"/> 15 <property name="make.DESTDIR" value="${up-two}/target/"/> 16 <property name="make.CXXFLAGS" value="-O0 -g"/> 17 <property name="make.CXX" value="ccache g++"/> 18 <property name="make.J" value="1"/> 19 12 20 <target name="get-source"> 13 21 <copy todir="${copy.dir}"> … … 50 58 </concat> 51 59 </target> 52 <target name="install" description="Installs files into tools/target"> 60 61 <target name="tools-build" depends="get-source" description="Uses autogen.sh and make to build artifacts"> 62 <exec executable="${basedir}/../autogen.sh" failonerror="true"> 63 <arg value="--with-ice=${make.ICE_HOME}"/> 64 <arg value="--prefix=${make.DESTDIR}"/> 65 <arg value="CXXFLAGS=${make.CXXFLAGS}"/> 66 <arg value="CXX=${make.CXX}"/> 67 </exec> 68 <exec executable="make" dir="src" failonerror="true"> <arg value="slice"/> </exec> 69 <exec executable="make" dir="src" failonerror="true"> <arg value="-j${make.J}"/> </exec> 70 <exec executable="make" dir="src" failonerror="true"> <arg value="install"/> </exec> 71 </target> 72 73 <target name="tools-dist" description="Copies files into tools/target"> 53 74 <copy todir="../target/include"> 54 75 <fileset dir="src/slice_generated" includes="**/*.h"/> … … 56 77 </copy> 57 78 </target> 79 80 <target name="clean"> 81 <delete dir="${copy.dir}"/> 82 <exec executable="make" failonerror="true"> <arg value="clean"/> </exec> 83 </target> 84 58 85 </project> -
branches/build_changes/components/tools/OmeroCpp/src/Makefile.am
r1532 r1537 344 344 ./slice_generated/OMERO/System.cpp\ 345 345 ./slice_generated/OMERO/fwd.cpp\ 346 ./OMERO/ClientErrors.cpp\347 346 ./OMERO/Model/DetailsI.cpp\ 348 347 ./OMERO/Model/PermissionsI.cpp -
branches/build_changes/components/tools/autogen.sh
r1532 r1537 25 25 autoconf -I.. || exit; 26 26 automake || exit; 27 ./configure $@27 ./configure "$@" -
branches/build_changes/components/tools/build.xml
r1531 r1537 14 14 </target> 15 15 16 <target name="build" description="Calls 'tools-build' on all components ">16 <target name="build" description="Calls 'tools-build' on all components to fill target"> 17 17 <mkdir dir="${tools.unjar}"/> 18 <ant dir="${basedir}/OmeroCpp" inheritAll="false" inheritRefs="false"> 19 <property name="current.component" value="tools/OmeroCpp"/> 20 <property name="test.with.fail" value="${test.with.fail}"/> 21 <property name="test.skip" value="${test.skip}"/> 22 <property name="generate.skip" value="${generate.skip}"/> 23 <property name="checks.skip" value="${checks.skip}"/> 24 <property name="classpath.file" value="${classpath.file}"/> 25 <target name="tools-build"/> 26 <target name="tools-dist"/> 27 </ant> 18 28 <ant dir="${basedir}/licenses" inheritAll="false" inheritRefs="false"> 19 29 <property name="current.component" value="tools/licenses"/> … … 24 34 <property name="classpath.file" value="${classpath.file}"/> 25 35 <target name="tools-build"/> 36 <target name="tools-dist"/> 26 37 </ant> 27 38 </target> 28 39 40 <target name="dist" description="Copies target onto an existing dist"> 41 <copy todir="../../dist"> 42 <fileset dir="target" includes="**/*"/> 43 </copy> 44 </target> 45 29 46 <target name="clean" description="Calls 'tools-clean' on all components."> 30 <delete dir="${tools.dest}"/> 47 <ant dir="${basedir}/OmeroCpp" inheritAll="false" inheritRefs="false"> 48 <property name="current.component" value="tools/OmeroCpp"/> 49 <target name="clean"/> 50 </ant> 31 51 <ant dir="${basedir}/licenses" inheritAll="false" inheritRefs="false"> 32 52 <property name="current.component" value="tools/licenses"/> 33 53 <target name="clean"/> 34 54 </ant> 55 <delete dir="${tools.dest}"/> 35 56 </target> 36 57 -
branches/build_changes/components/tools/licenses/build.xml
r1532 r1537 50 50 </target> 51 51 52 <!-- Additional functionality for the lifecycle.install target. 53 Copies the jar to ${tools.jars} for later copying into dist/client. --> 54 <target name="install" depends="lifecycle.install"> 55 <copy file="${target.dir}/${artifact.final.name}" todir="${tools.jars}"/> 56 </target> 52 <target name="tools-build" depends="package" description="Creates all artifacts for tools/target"> 53 </target> 57 54 58 <target name="dist" depends="lifecycle.dist" description="Copied artifacts to tools/target"> 55 <target name="tools-dist" description="Copied artifacts to tools/target"> 56 <copy todir="../target/client"> 57 <fileset dir="${target.dir}" includes="${artifact.final.name}"/> 58 </copy> 59 59 <copy todir="../target/include"> 60 60 <fileset dir="${resrc.dir}" includes="**/*.ice,**/*.h"/> 61 61 <fileset dir="src/slice_generated" includes="**/*.h"/> 62 62 <fileset dir="src" includes="**/*.h" excludes="**/slice_generated/**/*"/> 63 </copy> 63 64 </target> 65 64 66 </project>
