Changeset 4ea5622

Timestamp:

May 23, 2011 4:52:29 AM (9 years ago)

Author:

sponge <sponge@…>

Branches:

master

Children:

7ab95d0

Parents:

606300a

Message:

mbuild.sh fixups : add new jcpuid/mbuild.sh, edit jbigi/mbuild-all.sh — pedantic naming

Files:

• core/c/jbigi/mbuild-all.sh (modified) (2 diffs)
• core/c/jcpuid/mbuild.sh (added)
• core/c/mbuild.sh (modified) (2 diffs)
• history.txt (modified) (1 diff)

core/c/jbigi/mbuild-all.sh

@@ -28 +28 @@
 # Are there any other X86 platforms that work on i2p? Add them here.
 #
-# Oddly athlon64 builds.... I wonder what others can :-)
-#
-X86_PLATFORMS="pentium pentiummmx pentium2 pentium3 pentiumm pentium4 k6 k62 k63 athlon core2 corei athlon64 geode atom nano viac3 viac32"
+
+# Note! these build on 32bit as 32bit when operating as 32bit...
+X86_64_PLATFORMS="atom athlon64 core2 corei nano pentium4"
+
+# Note! these are 32bit _ONLY_
+X86_PLATFORMS="pentium pentiummmx pentium2 pentium3 pentiumm k6 k62 k63 athlon geode viac3 viac32 ${X86_64_PLATFORMS}"
 
 
@@ -56 +59 @@
         echo "Building windows .dlls for all architectures";;
 Linux*)
-        PLATFORM_LIST="${LINUX_PLATFORMS}"
         NAME="libjbigi"
         TYPE="so"
+        PLATFORM_LIST=""
         TARGET="-linux-"
-        echo "Building linux .sos for all architectures";;
+        arch=$(uname -m | cut -f1 -d" ")
+        case ${arch} in
+                i[3-6]86)
+                        arch="x86";;
+        esac
+        case ${arch} in
+                x86_64)
+                        PLATFORM_LIST="${X86_64_PLATFORMS}"
+                        TARGET="-linux-X86_64-";;
+                ia64)
+                        PLATFORM_LIST="${X86_64_PLATFORMS}"
+                        TARGET="-linux-ia64-";;
+                x86)
+                        PLATFORM_LIST="${X86_PLATFORMS}"
+                        TARGET="-linux-x86-";;
+                *)
+                        PLATFORM_LIST="${LINUX_PLATFORMS}";;
+        esac
+        echo "Building ${TARGET} .so's for ${arch}";;
 FreeBSD*)
         PLATFORM_LIST="${FREEBSD_PLATFORMS}"

core/c/mbuild.sh

@@ -3 +3 @@
 # Place latest gmp tarball in the jbigi dir, and exec this script.
 
-JBIGI=../../../installer/lib/jbigi/jbigi.jar
+#JBIGI=../../../installer/lib/jbigi/jbigi.jar
 
-if [ -f jbigi.jarx ] ; then
-JBIGI=../jbigi.jar
-fi
+#if [ -f jbigi.jarx ] ; then
+#JBIGI=../jbigi.jar
+#fi
 
-(cd jcpuid ; sh build.sh )
-(cd jbigi ; sh mbuild-all.sh )
+rm -f t/* jcpuid/lib/freenet/support/CPUInformation/* jbigi/lib/net/i2p/util/*
+
+( cd jcpuid ; ./mbuild.sh )
+( cd jbigi ; ./mbuild-all.sh )
 
 rm -Rf t
@@ -42 +44 @@
 
 
-echo "jbigi.jar Refreshed."
-echo "raw files ar in t."
+echo "jbigi.jar created."
+echo "raw files are in t."

history.txt

@@ +1 @@
+2011-05-23 sponge
+    * mbuild.sh fixups
+    * add new jcpuid/mbuild.sh -- pedantic naming
+    * jbigi/mbuild-all.sh -- pedantic naming
+    * see also http://zzz.i2p/topics/306?page=1#p3341
+
 2011-05-22 zzz
     * GeoIP: Read countries.txt in UTF-8