Changeset 1531
- Timestamp:
- 05/10/07 10:59:20 (19 months ago)
- Location:
- branches/build_changes
- Files:
-
- 1 added
- 11 removed
- 6 modified
- 11 copied
-
build.xml (modified) (4 diffs)
-
components/antlib/resources/lifecycle.xml (modified) (1 diff)
-
components/antlib/resources/macros.xml (modified) (2 diffs)
-
components/app/build.xml (modified) (1 diff)
-
components/blitz/AUTHORS (deleted)
-
components/blitz/COPYING (deleted)
-
components/blitz/ChangeLog (deleted)
-
components/blitz/INSTALL (deleted)
-
components/blitz/Makefile.am (deleted)
-
components/blitz/NEWS (deleted)
-
components/blitz/README (deleted)
-
components/blitz/autogen.sh (deleted)
-
components/blitz/build.xml (modified) (6 diffs)
-
components/blitz/configure.ac (deleted)
-
components/blitz/src/cpp (deleted)
-
components/blitz/test/cpp (deleted)
-
components/tools/OmeroCpp (added)
-
components/tools/OmeroCpp/AUTHORS (copied) (copied from trunk/components/blitz/AUTHORS)
-
components/tools/OmeroCpp/COPYING (copied) (copied from trunk/components/blitz/COPYING)
-
components/tools/OmeroCpp/ChangeLog (copied) (copied from trunk/components/blitz/ChangeLog)
-
components/tools/OmeroCpp/INSTALL (copied) (copied from trunk/components/blitz/INSTALL)
-
components/tools/OmeroCpp/Makefile.am (copied) (copied from trunk/components/blitz/Makefile.am) (3 diffs)
-
components/tools/OmeroCpp/NEWS (copied) (copied from trunk/components/blitz/NEWS)
-
components/tools/OmeroCpp/README (copied) (copied from trunk/components/blitz/README)
-
components/tools/OmeroCpp/autogen.sh (copied) (copied from trunk/components/blitz/autogen.sh)
-
components/tools/OmeroCpp/configure.ac (copied) (copied from trunk/components/blitz/configure.ac)
-
components/tools/OmeroCpp/src (copied) (copied from trunk/components/blitz/src/cpp)
-
components/tools/OmeroCpp/test (copied) (copied from trunk/components/blitz/test/cpp)
-
components/tools/build.xml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/build_changes/build.xml
r1501 r1531 48 48 they mask the lifecycle.xml target definitions. 49 49 --> 50 51 <macrodef name="iterate"> 52 <attribute name="target"/> 53 <sequential> 54 <iter><target name="@{target}"/></iter> 55 </sequential> 56 </macrodef> 57 58 <macrodef name="iter"> 59 <element name="elem" implicit="yes"/> 60 <attribute name="inheritAll" default="false"/> 61 <attribute name="inheritRefs" default="false"/> 62 <attribute name="file" default="build.xml"/> 63 <sequential> 64 <antRun component="dsl" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 65 <antRun component="common" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 66 <antRun component="romio" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 67 <antRun component="rendering" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 68 <antRun component="importer" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 69 <antRun component="server" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 70 <antRun component="client" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 71 <antRun component="bioformats-omero" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 72 <!-- These are our final products, and should be run last --> 73 <antRun component="blitz" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 74 <antRun component="app" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 75 </sequential> 76 </macrodef> 77 78 <macrodef name="antRun"> 79 <attribute name="file" default="build.xml"/> 80 <attribute name="component"/> 81 <attribute name="inheritAll" default="false"/> 82 <attribute name="inheritRefs" default="false"/> 83 <element name="targets" implicit="yes"/> 84 <sequential> 85 <echo> +===========================================================================================+ </echo> 86 <echo> | </echo> 87 <echo> | @{component} </echo> 88 <echo> | </echo> 89 <echo> +===========================================================================================+ </echo> 90 <ant dir="${components.dir}/@{component}" antfile="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"> 91 <property name="current.component" value="@{component}"/> 92 <property name="multi.test.with.fail" value="${test.with.fail}"/> 93 <property name="multi.test.skip" value="${test.skip}"/> 94 <property name="multi.generate.skip" value="${generate.skip}"/> 95 <property name="multi.checks.skip" value="${checks.skip}"/> 96 <property name="classpath.file" value="${classpath.file}"/> 97 <targets/> 98 </ant> 99 </sequential> 100 </macrodef> 101 50 102 <target name="multiproject" depends="compatibility,init"/> 51 103 … … 92 144 <target name="dist"> 93 145 <mkdir dir="${dist.dir}"/> 94 < echo>javadoc needs to copy images</echo>146 <iterate target="dist"/> 95 147 96 148 <!-- … … 132 184 </fileset> 133 185 </copy> 134 <copy todir="${dist.dir}"> 135 <fileset dir="${app.comp}/${target.rel}"> 136 <include name="*.ear"/> 137 </fileset> 138 </copy> 139 140 <!-- 141 SQL to createdb. 142 --> 186 187 <!-- SQL to createdb. --> 143 188 <copy todir="${dist.dir}/sql"> 144 189 <fileset dir="${common.comp}/${generated.rel}/resources" includes="*.sql"/> 145 190 </copy> 146 <!-- 147 Copy new build.xml to ${dist.dir} 148 --> 191 192 <!-- Copy new build.xml to ${dist.dir} --> 149 193 <copy 150 194 file="${import.dir}/omero.xml" … … 152 196 overwrite="true" 153 197 /> 154 <!--155 OMERO.blitz156 -->157 <copy todir="${dist.dir}/etc">158 <fileset dir="${blitz.comp}/resources" includes="*.config"/>159 <flattenmapper/>160 </copy>161 162 <copy todir="${dist.dir}/include">163 <fileset dir="${blitz.comp}/src/cpp" includes="**/*.h"/>164 <fileset dir="${blitz.comp}/src/cpp/generated" includes="**/*.h"/>165 <fileset dir="${blitz.comp}/src/cpp/generated2" includes="**/*.h"/>166 <fileset dir="${blitz.comp}/resources/slice" includes="**/*.ice"/>167 <fileset dir="${blitz.comp}/target/generated/resources" includes="**/*.ice"/>168 </copy>169 170 <copy todir="${dist.dir}/lib">171 <fileset dir="${blitz.comp}/src/cpp/.libs" includes="**/*.so*" followsymlinks="false"/>172 <flattenmapper/>173 </copy>174 175 <copy todir="${dist.dir}/blitz">176 <fileset dir="${blitz.comp}/target/standalone" includes="**/*"/>177 </copy>178 179 <useServices dir="${dist.dir}/blitz/"/>180 198 181 199 <copy todir="${dist.dir}/client"> -
branches/build_changes/components/antlib/resources/lifecycle.xml
r1397 r1531 271 271 </target> 272 272 273 <target name="dist" depends="integration"> 274 <!-- empty by default --> 275 </target> 276 273 277 <target name="clean"> 274 278 <delete dir="${target.dir}"/> -
branches/build_changes/components/antlib/resources/macros.xml
r1397 r1531 25 25 build tools 26 26 = = = = = = = = = = = = = = = = = --> 27 <macrodef name="iterate">28 <attribute name="target"/>29 <sequential>30 <iter><target name="@{target}"/></iter>31 </sequential>32 </macrodef>33 34 <macrodef name="iter">35 <element name="elem" implicit="yes"/>36 <attribute name="inheritAll" default="false"/>37 <attribute name="inheritRefs" default="false"/>38 <attribute name="file" default="build.xml"/>39 <sequential>40 <antRun component="dsl" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>41 <antRun component="common" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>42 <antRun component="romio" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>43 <antRun component="rendering" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>44 <antRun component="importer" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>45 <antRun component="server" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>46 <antRun component="blitz" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>47 <antRun component="client" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>48 <antRun component="bioformats-omero" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>49 <antRun component="tools" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>50 <!-- app must be very last so that the services.jar can be produced from tools/ -->51 <antRun component="app" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun>52 </sequential>53 </macrodef>54 55 <macrodef name="antRun">56 <attribute name="file" default="build.xml"/>57 <attribute name="component"/>58 <attribute name="inheritAll" default="false"/>59 <attribute name="inheritRefs" default="false"/>60 <element name="targets" implicit="yes"/>61 <sequential>62 <echo> +===========================================================================================+ </echo>63 <echo> | </echo>64 <echo> | @{component} </echo>65 <echo> | </echo>66 <echo> +===========================================================================================+ </echo>67 <ant dir="${components.dir}/@{component}" antfile="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}">68 <property name="current.component" value="@{component}"/>69 <property name="multi.test.with.fail" value="${test.with.fail}"/>70 <property name="multi.test.skip" value="${test.skip}"/>71 <property name="multi.generate.skip" value="${generate.skip}"/>72 <property name="multi.checks.skip" value="${checks.skip}"/>73 <property name="classpath.file" value="${classpath.file}"/>74 <targets/>75 </ant>76 </sequential>77 </macrodef>78 27 79 28 <macrodef name="svn"> … … 170 119 omero.classpath has been defined.--> 171 120 172 <macrodef name="useServices ">121 <macrodef name="useServicesX"> 173 122 <attribute name="dir"/> 174 123 <attribute name="manifest" default=""/> -
branches/build_changes/components/app/build.xml
r1379 r1531 81 81 </target> 82 82 83 <target name="dist" depends="package"> 84 <copy todir="${dist.dir}"> 85 <fileset dir="${target.dir}"> 86 <include name="artifact.final.name"/> 87 </fileset> 88 </copy> 89 </target> 90 83 91 </project> -
branches/build_changes/components/blitz/build.xml
r1514 r1531 87 87 <hbmtemplate template="templates/java_ice_map.vm" filepattern="src/omero/util/IceMap.java" /> 88 88 <hbmtemplate template="templates/java_obj_reg.vm" filepattern="src/omero/util/ObjectFactoryRegistrar.java" /> 89 <hbmtemplate template="templates/cpp_obj_reg.vm" filepattern=" ../../src/cpp/generated/OMERO/ObjectFactoryRegistrar.cpp" />89 <hbmtemplate template="templates/cpp_obj_reg.vm" filepattern="src/OMERO/ObjectFactoryRegistrar.cpp" /> 90 90 </hibernate> 91 91 … … 98 98 <split-combined prefix="hdr"> 99 99 <!-- resources/*I.combined => ../../src/cpp/generated/*I.h --> 100 <regexpmapper from="target/generated/resources/(.*?)I[.]combined" to=" src/cpp/generated/OMERO/Model/\1I.h"/>100 <regexpmapper from="target/generated/resources/(.*?)I[.]combined" to="target/generated/resources/OMERO/Model/\1I.h"/> 101 101 </split-combined> 102 102 <split-combined prefix="cpp"> 103 <regexpmapper from="target/generated/resources/(.*?)I[.]combined" to=" src/cpp/generated/OMERO/Model/\1I.cpp"/>103 <regexpmapper from="target/generated/resources/(.*?)I[.]combined" to="target/generated/src/OMERO/Model/\1I.cpp"/> 104 104 </split-combined> 105 105 <split-combined prefix="jav"> … … 124 124 <present present="both" targetdir="${resrc.dir}/slice"/> 125 125 </fileset> 126 <fileset dir="${ src.dir}/cpp/generated" includes="**/*.h">126 <fileset dir="${resrc.dest}" includes="**/*.h"> 127 127 <present present="both" targetdir="${src.dir}/cpp"/> 128 128 </fileset> 129 <fileset dir="${src.d ir}/cpp/generated" includes="**/*.cpp">129 <fileset dir="${src.dest}" includes="**/*.cpp"> 130 130 <present present="both" targetdir="${src.dir}/cpp"/> 131 131 </fileset> … … 136 136 into a single header file. 137 137 --> 138 <concat destfile="${ src.dir}/cpp/generated/OMERO/ModelI.h">138 <concat destfile="${resrc.dest}/OMERO/ModelI.h"> 139 139 <header> 140 140 … … 152 152 153 153 </header> 154 <fileset dir="${ src.dir}/cpp" includes="**/OMERO/Model/*I.h"/>154 <fileset dir="${resrc.dest}" includes="**/OMERO/Model/*I.h"/> 155 155 <footer> 156 156 … … 169 169 </target> 170 170 171 <target name="dist" depends="package,install"><!-- install for standalone --> 172 <copy todir="${dist.dir}/etc"> 173 <fileset dir="${resrc.dir}" includes="*.config"/> 174 <flattenmapper/> 175 </copy> 176 <copy todir="${dist.dir}/include"> 177 <fileset dir="${src.dir}/cpp" includes="**/*.h"/> 178 <fileset dir="${resrc.dir}/slice" includes="**/*.ice"/> 179 <fileset dir="${resrc.dest}" includes="**/*.ice,**/*.h"/> 180 </copy> 181 <copy todir="${dist.dir}/blitz"> 182 <fileset dir="${target.dir}/standalone" includes="**/*"/> 183 </copy> 184 </target> 171 185 172 186 </project> -
branches/build_changes/components/tools/OmeroCpp/Makefile.am
r1498 r1531 1 SUBDIR= src /cpp test/cpp1 SUBDIR= src test 2 2 3 CLEANFILES = \4 »···generated/*.cpp \5 »···generated/*.h \6 »···generated/OMERO/*.cpp \7 »···generated/OMERO/*.h \8 »···generated/OMERO/Model/*.cpp \9 »···generated/OMERO/Model/*.h10 3 DISTCLEANFILES = \ 11 4 config.cache \ … … 23 16 ltmain.sh \ 24 17 missing \ 25 mkinstalldirs 18 mkinstalldirs\ 19 Makefile.in\ 20 configure 26 21 27 22 all : slice src test … … 29 24 slice: force 30 25 @date 31 cd src /cpp; $(MAKE) $(MFLAGS) slice26 cd src ; $(MAKE) $(MFLAGS) slice 32 27 @date 33 28 34 29 src: force 35 30 @date 36 cd src /cpp; $(MAKE) $(MFLAGS)31 cd src ; $(MAKE) $(MFLAGS) 37 32 @date 38 33 39 34 test: force 40 35 @date 41 cd test/cpp ; $(MAKE) $(MFLAGS) 36 cd test ; $(MAKE) $(MFLAGS) 37 @date 38 39 clean: force 40 @date 41 cd src ; $(MAKE) $(MFLAGS) clean 42 cd test ; $(MAKE) $(MFLAGS) clean 42 43 @date 43 44 -
branches/build_changes/components/tools/build.xml
r1375 r1531 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <project name="tools" default=" install" basedir=".">2 <project name="tools" default="help" basedir="."> 3 3 4 4 <dirname property="up-one" file="${basedir}"/> 5 5 <import file="${up-one}/antlib/resources/global.xml"/> 6 6 7 <target name="help" >7 <target name="help" description="This help message"> 8 8 <echo> 9 9 The tools/ directory is a special repository 10 for loosely coupled OMERO components. 10 for loosely coupled OMERO components. Each of 11 these tools depends on a completed "dist" of 12 OMERO. 11 13 </echo> 12 14 </target> 13 15 14 <!-- This property determines which tools will have their 15 build file called. To use: 16 17 java omero -Dtools=licences,admin TARGET 18 19 --> 20 <property name="tools" value=""/> 21 22 <macrodef name="callTools"> 23 <sequential/> 24 </macrodef> 25 26 <target name="parsetools"> 27 28 </target> 29 30 <target name="prepare" depends="parsetools"/> 31 32 <target name="generate"/> 33 34 <target name="compile"/> 35 36 <target name="testng-init"/> 37 38 <target name="test"/> 39 40 <target name="junittest"/> 41 42 <target name="package"/> 43 44 <target name="install"> 16 <target name="build" description="Calls 'tools-build' on all components"> 45 17 <mkdir dir="${tools.unjar}"/> 46 18 <ant dir="${basedir}/licenses" inheritAll="false" inheritRefs="false"> … … 51 23 <property name="checks.skip" value="${checks.skip}"/> 52 24 <property name="classpath.file" value="${classpath.file}"/> 53 <target name=" install"/>25 <target name="tools-build"/> 54 26 </ant> 55 27 </target> 56 28 57 <target name="integration"/> 58 59 <target name="clean"> 60 <delete dir="${tools.dest}"/> 29 <target name="clean" description="Calls 'tools-clean' on all components."> 30 <delete dir="${tools.dest}"/> 61 31 <ant dir="${basedir}/licenses" inheritAll="false" inheritRefs="false"> 62 32 <property name="current.component" value="tools/licenses"/>
