From 73a6e47d1baa45b34d3b857dcd90794f2438ee68 Mon Sep 17 00:00:00 2001
From: Jay Freeman <saurik@saurik.com>
Date: Wed, 2 Jul 2008 08:13:38 +0000
Subject: Finally merging latest builds of JocStrap and UICaboodle, bringing
 the latter build environment in-house.

git-svn-id: http://svn.telesphoreo.org/trunk@352 514c082c-b64e-11dc-b46d-3d985efe055d
---
 data/jocstrap/_metadata/version              |   2 +-
 data/jocstrap/jocstrap-1.0.2382.tgz          | Bin 38502 -> 0 bytes
 data/jocstrap/jocstrap-1.0.2466.tgz          | Bin 0 -> 39391 bytes
 data/jocstrap/make.sh                        |   6 ++++--
 data/uicaboodle/_metadata/depends            |   1 +
 data/uicaboodle/_metadata/version            |   2 +-
 data/uicaboodle/libuicaboodle.jnilib         | Bin 18308 -> 0 bytes
 data/uicaboodle/make.sh                      |   8 ++++++--
 data/uicaboodle/minimal-2378.tgz             | Bin 0 -> 2758 bytes
 data/uicaboodle/uicaboodle.jar               | Bin 5127 -> 0 bytes
 data/uicaboodle/uicaboodle.java-1.0.2467.tgz | Bin 0 -> 11572 bytes
 11 files changed, 13 insertions(+), 6 deletions(-)
 delete mode 100644 data/jocstrap/jocstrap-1.0.2382.tgz
 create mode 100644 data/jocstrap/jocstrap-1.0.2466.tgz
 create mode 100644 data/uicaboodle/_metadata/depends
 delete mode 100755 data/uicaboodle/libuicaboodle.jnilib
 create mode 100644 data/uicaboodle/minimal-2378.tgz
 delete mode 100644 data/uicaboodle/uicaboodle.jar
 create mode 100644 data/uicaboodle/uicaboodle.java-1.0.2467.tgz

(limited to 'data')

diff --git a/data/jocstrap/_metadata/version b/data/jocstrap/_metadata/version
index af32f10f3..05af0f1c9 100644
--- a/data/jocstrap/_metadata/version
+++ b/data/jocstrap/_metadata/version
@@ -1 +1 @@
-1.0.2382
+1.0.2466
diff --git a/data/jocstrap/jocstrap-1.0.2382.tgz b/data/jocstrap/jocstrap-1.0.2382.tgz
deleted file mode 100644
index 4c7034d33..000000000
Binary files a/data/jocstrap/jocstrap-1.0.2382.tgz and /dev/null differ
diff --git a/data/jocstrap/jocstrap-1.0.2466.tgz b/data/jocstrap/jocstrap-1.0.2466.tgz
new file mode 100644
index 000000000..effa6d34b
Binary files /dev/null and b/data/jocstrap/jocstrap-1.0.2466.tgz differ
diff --git a/data/jocstrap/make.sh b/data/jocstrap/make.sh
index 6272e3f96..a9be213ed 100644
--- a/data/jocstrap/make.sh
+++ b/data/jocstrap/make.sh
@@ -1,7 +1,9 @@
 pkg:extract
 cd jocstrap-*
-make
-pkg: mkdir -p /usr/lib /usr/share/java
+# XXX: omg this is stupid
+PKG_ROOT2=/apl/sys/ad8 make
+pkg: mkdir -p /usr/include/joc /usr/lib /usr/share/java
+cp -a source/joc/*.h "${PKG_DEST}"/usr/include/joc
 pkg: cp -a libobjc-sig.dylib /usr/lib
 pkg: cp -a libjocstrap.jnilib /usr/lib
 pkg: cp -a jocstrap.jar /usr/share/java
diff --git a/data/uicaboodle/_metadata/depends b/data/uicaboodle/_metadata/depends
new file mode 100644
index 000000000..8f7c537e5
--- /dev/null
+++ b/data/uicaboodle/_metadata/depends
@@ -0,0 +1 @@
+jvm
diff --git a/data/uicaboodle/_metadata/version b/data/uicaboodle/_metadata/version
index 6ff86d092..0583411dc 100644
--- a/data/uicaboodle/_metadata/version
+++ b/data/uicaboodle/_metadata/version
@@ -1 +1 @@
-1.0.2359
+1.0.2467
diff --git a/data/uicaboodle/libuicaboodle.jnilib b/data/uicaboodle/libuicaboodle.jnilib
deleted file mode 100755
index fcd2f1cb8..000000000
Binary files a/data/uicaboodle/libuicaboodle.jnilib and /dev/null differ
diff --git a/data/uicaboodle/make.sh b/data/uicaboodle/make.sh
index 03edf96dd..48a0bbdf4 100644
--- a/data/uicaboodle/make.sh
+++ b/data/uicaboodle/make.sh
@@ -1,3 +1,7 @@
+pkg:extract
+cd uicaboodle.java-*
+mv ../minimal source/com/saurik/uicaboodle
+./ant.sh
 pkg: mkdir -p /usr/lib /usr/share/java
-pkg: cp %/libuicaboodle.jnilib /usr/lib
-pkg: cp %/uicaboodle.jar /usr/share/java
+pkg: cp -a archives/libuicaboodle.jnilib /usr/lib
+pkg: cp -a archives/uicaboodle.jar /usr/share/java
diff --git a/data/uicaboodle/minimal-2378.tgz b/data/uicaboodle/minimal-2378.tgz
new file mode 100644
index 000000000..602860854
Binary files /dev/null and b/data/uicaboodle/minimal-2378.tgz differ
diff --git a/data/uicaboodle/uicaboodle.jar b/data/uicaboodle/uicaboodle.jar
deleted file mode 100644
index 3c56ceec3..000000000
Binary files a/data/uicaboodle/uicaboodle.jar and /dev/null differ
diff --git a/data/uicaboodle/uicaboodle.java-1.0.2467.tgz b/data/uicaboodle/uicaboodle.java-1.0.2467.tgz
new file mode 100644
index 000000000..980bc19ad
Binary files /dev/null and b/data/uicaboodle/uicaboodle.java-1.0.2467.tgz differ
-- 
cgit v1.2.3