From 8dfb151b4a8796fbf09a6cc2e5112467a63663e3 Mon Sep 17 00:00:00 2001
From: herwin <welberge@ewi.utwente.nl>
Date: Mon, 2 Jul 2012 14:25:14 +0200
Subject: [PATCH] hooked up to hmibuild
---
.gitignore | 2 ++
build.xml | 2 +-
cpp/build.xml | 5 ++++-
java/build.properties | 1 +
java/build.xml | 8 +++++---
java/ivy.xml | 2 +-
java/manifest.mf | 14 +++++++-------
python/build.properties | 1 +
python/build.xml | 3 ++-
python/ivy.xml | 4 ++++
10 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index a061e8b..907e23b 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 298d865..b280d79 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 e18401e..2a94c60 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 8c6fc14..de98c80 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 210b34a..996ee0e 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 fd0007f..7a5fc34 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 5f13071..829110f 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 aa9003a..fba546a 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 2c571af..f24e485 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 b24cc6a..9eb9889 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>
--
GitLab