diff --git a/.gitignore b/.gitignore index a061e8b25a1330d44e156bc701b5c50951032a2a..907e23b9fb81458cabc7b7129940eeb0d77bc5c4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ .*.sw[a-z] *.un~ Session.vim +**/manifest.mf +**/*.*~ diff --git a/build.xml b/build.xml index 298d8654b0586cf55a8139513369c45fd9e160e4..b280d792a719da75a4306387ad816c6738213b99 100644 --- a/build.xml +++ b/build.xml @@ -1,4 +1,4 @@ -<project name="ipaaca" default="build" basedir="."> +<project name="ipaaca-all" default="build" basedir="."> <target name="resolve"> <subant target="resolve" genericantfile="build.xml"> <fileset dir="." includes="*/build.xml"/> diff --git a/cpp/build.xml b/cpp/build.xml index e18401ea00b2e673134e9778f602fe9e04637b83..2a94c602a4934917ca916762e3a9c9145b5e9afc 100644 --- a/cpp/build.xml +++ b/cpp/build.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="IpaacaCpp" default="run"> - <import file="../../soashared/ant/build.xml" /> + <target name="-pre-compilation"> <echo message="Compiling protobuf file" /> <exec executable="protoc"> @@ -9,5 +9,8 @@ <arg value="--cpp_out=build/" /> </exec> </target> + + <!--import file="../../soashared/ant/build.xml" /--> + <import file="../../HmiBuild/build.xml" /> </project> diff --git a/java/build.properties b/java/build.properties index 8c6fc149f768d847b59e7027cffd5e871b7ef777..de98c805262dd9ae57b3d093aca519cd8c9f2829 100644 --- a/java/build.properties +++ b/java/build.properties @@ -1,6 +1,7 @@ language=java resolve.status=beta resource.path= +publish.resolver=soa.core.repository #resource.path=${shared.repository}/Humanoids;${shared.repository}/3dmodels;${shared.repository}/HMI/HmiElckerlyc/resources;${shared.repository}/logbackconfig;${shared.repository}/shaders; run.jvmargs= -Xms128m -Xmx512m -Xss5M rebuild.list= diff --git a/java/build.xml b/java/build.xml index 210b34a990975a7c828d943e463e603f2a0e1be4..996ee0e6a6851df299e656ba31c531cff1632f34 100644 --- a/java/build.xml +++ b/java/build.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="IpaacaJava" default="run"> - <import file="../../soashared/ant/build.xml" /> - +<project name="ipaaca-java" default="run"> + <target name="-pre-compilation"> <echo message="Compiling protobuf file" /> <mkdir dir="generatedsrc"/> @@ -11,4 +10,7 @@ <arg value="--java_out=generatedsrc/" /> </exec> </target> + + <!--import file="../../soashared/ant/build.xml" /--> + <import file="../../HmiBuild/build.xml" /> </project> diff --git a/java/ivy.xml b/java/ivy.xml index fd0007f6e8809662be9819b3bf4212834649c97f..7a5fc340273b483428d9ab46df5d6e6a1ec52c1a 100644 --- a/java/ivy.xml +++ b/java/ivy.xml @@ -1,5 +1,5 @@ <ivy-module version="2.0"> - <info organisation="ipaaca" module="ipaaca"/> + <info organisation="ipaaca" module="ipaaca-java"/> <configurations> <include file="${ivy.settings.dir}/configurations.xml"/> </configurations> diff --git a/java/manifest.mf b/java/manifest.mf index 5f1307134cd9ebfa637c79613ae1249c903beaf7..829110fcd98566df508f0e875a6a85daab1d86b8 100644 --- a/java/manifest.mf +++ b/java/manifest.mf @@ -1,10 +1,10 @@ Manifest-Version: 1.0 -Main-Class: ipaaca.Info - -Name: ipaaca -Specification-Title: ipaaca +Main-Class: main + +Name: IpaacaJava +Specification-Title: IpaacaJava Specification-Version: 0.1 Specification-Vendor: ipaaca -Implementation-Title: ipaaca -Implementation-Version: February 21 2012 05:23 PM -Implementation-Vendor: ipaaca +Implementation-Title: IpaacaJava +Implementation-Version: July 02 2012 01:46 PM +Implementation-Vendor: ipaaca \ No newline at end of file diff --git a/python/build.properties b/python/build.properties index aa9003a9c77f1ce8614fe43a382b09d6778c25ab..fba546ac8220446b170b2f6fdfa294f84bd8be02 100644 --- a/python/build.properties +++ b/python/build.properties @@ -4,4 +4,5 @@ resource.path=${shared.resources}/Shared3DModels/resource;${shared.resources}/De rebuild.list= pyzip.excludes= run.py=run.py +publish.resolver=soa.core.repository diff --git a/python/build.xml b/python/build.xml index 2c571af2bc17e9bc76328646e3960baf3a756d15..f24e48505d48491e5c3ea0333c79e60f098096e4 100644 --- a/python/build.xml +++ b/python/build.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="IpaacaPython" default="run"> - <import file="../../soashared/ant/build.xml" /> + <!--import file="../../soashared/ant/build.xml" /--> + <import file="../../HmiBuild/build.xml" /> <target name="-pre-compilation"> <echo message="Compiling protobuf file" /> <exec executable="protoc"> diff --git a/python/ivy.xml b/python/ivy.xml index b24cc6a006dbef42152a7da7e37b10ddfed0ad81..9eb98898c4d5a552bd530ee05c39b90c9d942350 100644 --- a/python/ivy.xml +++ b/python/ivy.xml @@ -1,7 +1,11 @@ <ivy-module version="2.0"> <info organisation="ipaaca" module="IpaacaPython" /> + <publications> + <artifact type="zip" ext="zip"/> + </publications> <dependencies> <dependency org="google" name="protobuf" rev="latest.release"/> <dependency org="rsb" name="rsb" rev="latest.release"/> </dependencies> + </ivy-module>