From a704c54d4e1eaf18c3fb8abd380304c69c310c32 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 27 Mar 2012 06:27:19 +0200 Subject: [PATCH] Generate and add *.apk files to the 7z archive [for deployment] --- build.xml | 23 ++++- nbproject/project.properties | 1 + resources/android/AndroidManifest-jocl.xml | 17 ++++ .../android/res-jocl/drawable-hdpi/icon.png | Bin 0 -> 2516 bytes .../android/res-jocl/drawable-ldpi/icon.png | Bin 0 -> 1172 bytes .../android/res-jocl/drawable-mdpi/icon.png | Bin 0 -> 1570 bytes resources/android/res-jocl/layout/main.xml | 12 +++ resources/android/res-jocl/values/strings.xml | 8 ++ scripts/make.jocl.all.android-armv7-cross.sh | 92 ++++++++++++++++++ 9 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 resources/android/AndroidManifest-jocl.xml create mode 100644 resources/android/res-jocl/drawable-hdpi/icon.png create mode 100644 resources/android/res-jocl/drawable-ldpi/icon.png create mode 100644 resources/android/res-jocl/drawable-mdpi/icon.png create mode 100644 resources/android/res-jocl/layout/main.xml create mode 100644 resources/android/res-jocl/values/strings.xml create mode 100755 scripts/make.jocl.all.android-armv7-cross.sh diff --git a/build.xml b/build.xml index 2fa7263..e63fee4 100644 --- a/build.xml +++ b/build.xml @@ -29,6 +29,7 @@ + @@ -43,7 +44,8 @@ - + + @@ -282,7 +284,7 @@ - + @@ -315,7 +317,7 @@ - + @@ -351,9 +353,22 @@ - + + + diff --git a/nbproject/project.properties b/nbproject/project.properties index f446db9..6ad9ee0 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -99,6 +99,7 @@ jar.classpath= #the jocl version you are building jocl_base_version=0.9 +jocl_int_version=0 #force enable jdk7 features #enable.jdk7.features=true diff --git a/resources/android/AndroidManifest-jocl.xml b/resources/android/AndroidManifest-jocl.xml new file mode 100644 index 0000000..e02ee3d --- /dev/null +++ b/resources/android/AndroidManifest-jocl.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/resources/android/res-jocl/drawable-hdpi/icon.png b/resources/android/res-jocl/drawable-hdpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2148232c9a3bb23f705e8c6baaa30f9827cd44e1 GIT binary patch literal 2516 zcmV;_2`l!AP)Px#32;bRa{vGe@Bjb`@Bu=sG?)MY00(qQO+^RW2OAeK9V9%Z9RL6cW=TXrRA}Dq znp;yF$rZ=XXmmkB=!Sp=ArP3GZLk3&&;?ys8}qcUo8&2#s(sF9@JpUk`2=}LRW_+j z#o4N@b=CwHNq{aa5?8xyFBc&RV}qm_T}K*eCJ%DiAoXDFmc4duO~0Y;>FHnp`eF@@M~-W_?0#uj0fYvcrYG}2jjtbFdmEtRt0Ad_4?BfH=<#KDG&_kCipQoz2Bw}%YZ;!)bxpHMFMq*JC$~6TF5f0i$ z(5pbv@N?ddy^os5%hS^*Kki*I7*tBd-~WC8Z(n^?W|-<1W7zn}$REG>qFra$dJcyP zs9lEu1HBSPbs!Ue1U5!d)Ia|7^`HLymoM+%7YGD%GtQo_uG(QN%dT&2eY>zAgkp~d z8c|DUScs({N`4&9BecEaTJ>h~+5fpbD}gn=PIuSo6pPS%?hghJj*gmT(5?WaHI*2M z5Rfl^XfT?l-Cp0z_!$6Xvf0(ZTB%f;o|^3G(qkw;a2ScqFS%KU?pA|Lgq|~z`#GY$ zW3ctjEq^drv0D~n-9Ddd)!WtCIXB}J3DFDp1=pYM?Q3M9Q=;cAF%V7yMSnQ3QmN$e z`OXrFbM{tP2?QvLvP>BJdwP&hg^!{OZVywY4H{_V5G|gAaPq@}1%jdFz#7B8aeyqw zy1jmn&#&ufpLIAI#0byLVyt(4?a`B`YANVd=$Tm-!b!*#KLl7st|UQJJINyD@_JM0 zwCUFPU|%ot+1T?JORKBpGTp5PIm*kh0ErxglTiQN^v=Ni>p_>-dtR>BZDVIQdVH+w zXuoZjPF}urdwu0{Nv}eS1_1FagcJ3OCU{rY<@Wkn4Dn8hSYkJuR7xcPeA3qHv|1!$ z2~srIsyDQ~t(Jj70|E>!S}X7u&1RQYS94Sj6|iB`lamg!834)*U>IhdG>(sq zpan@Lm;C{TVRTApl5pN>NA+3SI{*uWLLOfL*(H%ktdmBmRC<&IUl3d@#YJ8q+AY*$!WFZX?S)D5dxl_K_Uwdvw3R# z7IL<9I=k%m(=^?o1SLmMPf!pg>PTB?ntryozp}P=8jsg@w=_48-xwJi84(E3Tkyli zrhh$%>{2M?Hj_y#7Vn)wA`dJ;G7rZoxc-S^dTKHd3ehFH_D);$tXPaj>(peI3Q`3q zGle%bwqV{+qc^XKI7JL^8SPSlA$0QFi z0@TvW(ojLg5}a0x(_+SJWGORD;-QDkHo+Sx|VtI?>OR!c)eLnH~O**Ccs zNkNPRxm@nFSQ;A8r)?z=2ySgF8bGfC9JO=?AVNSQSBH&>L?XM{+@ zZ|Ne$$jjX08;OSc`=+NRag;3;iiLT%J9>P4{>Qb@#`dGf$VpqY&9`kfnM@W=!i!9G zYMd@WlmMwz>a<$qjg1_hc4KpQw@JcwD$)LpVIiEnOtd#o357zZ)q>1+0buViyb@SD zZ(R?UTdlSSO9fu~DRGM2ehWa;MW7y&78N95odh zVq|^pzOSdpVl*N%!a}j|-QrRt7OVW}{o#k*Cr^+wwzg_TFHN(O|0?smZfZ;fP+h!Z+y@DLNe{{I$Sq6YeEcW%c z-{o?7X<|xEA5hQ8Q>j!$f=`x(8I0Cu?Xd4l=plZt$3Wc){`#>)`aUxRWU%&k4 zzrOjVR4yY2n2i%d{e3A4q9iaJC!||-!PkwA3{Q;SM9!AVWaeG2BtdkkpiPcGkoj}> z!NG_MpI_z4t1}WOc&hD~5AQnQm8n{;UJY5}pp$B3ZcH1`HXE4+$ngA2rbvlOn z`-vQcQ78UYy;=ooj!5GA;2_sclcVykRc|Jf(J7&YL$quW4igtdN>LGg(qgIV*<%AeBmI9d?aM&2gt~&b!`*{UBj=qK zP6A!31FWsJWyWenmMAVnhMH#c#I4GnWjG2F8X4%-Z~53Ikw_dCQ*nk*^E){1P z<9r((9{z0Z?)hT)YpY{e*0t)}KMc1kpi_x({TKjMg2TkCy6W4%k3HSn`|rZ{kDooG zs6y37s+0=z#H~9HCo57MR`M>kYO|q12%SpkR)Y|)%exXJ`Cwtuw;oKVGgWKDFw8VD zKI^cnwVg*K{xSn4rq(W?QvqG-`ab*>3Wang!_-)hNF-D$6as;uSVCW16=x{yyI( literal 0 HcmV?d00001 diff --git a/resources/android/res-jocl/drawable-ldpi/icon.png b/resources/android/res-jocl/drawable-ldpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c16211f36eaa1a095edc070172630b32f068140c GIT binary patch literal 1172 zcmV;F1Z(?=P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RW2OAeM4wAHnK>z>*CP_p=R7l6| zR!dVORTTbi(w&4bBxzm(GbAGvqd*W6VR)n)D`B+CDywv-E?n!%h5y8@Wt9u7w5%G- zm2M>9&@U`Pm$vF4Ewkda6_0rKed!$mhCF|(OLXCr5I&*^jf>+hWJp4&uKRlF=S z;3e86*d^Hi6pVVV>_VaN;Nc@hQ2-D^9Cq8)j!vO~@?fZ=amD;^fNk#V6bi+S?d|V= z{7Hohpsls_lMg>`?H>Ou4Ca)p4d-%=qtrR2~9`A&^cRsqk1wfMJ;9Tf) z_lTp;k&zLcC=4fjYjUTE%bQb74p!;@kbW>8915hGWNZ8!|(HHHBpJm zFDz+9|2$01@S$?IJOgg8cPyTU3aCIrfX6%WMqj`7RFdV{aJXJgGj(UORFDuLDb-+v z5WmlN-Km%EICnC`hl<5wkmqAN+gi{>n*uC*tlE!q`p%Og>TQiv97`FET4X&ITU}Xj zGF6>R3N-@hy6y^aEFpT@Y*?zH$Kf!W%zmHmNURqsXt|hkO*`y%KkK6@T61GN zJ4?&+P6mcEc2AFy%+!EgZEp{7zVaN>Y+_`%&plE}tHXx&>Pv(h8@=iAKp$6XkmuEt zy_Pd_ii%wUd9mg`d+(jM#Zu`}Jgz7zA*6|M__?=aqqV_;1`7aKX}A~|t0#}Gq2Z$s z-fwMgJ`!~CJv~Ug+TDD`Y!+nzAV8)FQv3U@s;VSOW#Ld1RXM^5K*+NPnPx#32;bRa{vGf6951U69E94oEQKA00(qQO+^RW2OAePBJVAHWdHyLv`IukR9M69 znA>j}M-+$8?80(!xFxpZm>8Sftl}Fs#5QK3!StccTck?;v-;Zhsj5_|ic%>}qqb3E zgUtf2shuWH(j<=Uuq^n3%`O*nhwXze48%OumQsn)Jk6dt^P6wZo-?~h6h-)$8UY_! zYYA!zY6)ryY6<$-1xfzPJiKMf=osuat1prjDBnePTfh5jS&`vxK z0MB2&`tjb+rShRB2}xSa!(ZL`vOsmO?!j^4CJ^W~V7dr$>De4vY-{W5Z@;_y;Mb{} z);@z_m)|?+Te~~IJ)U{&dD5+}D5a1s9rjESR^t%n&n$-K0>MBi^vL54bDY~jD`fKH zMkM{om{i+cQiy}H`o zRyQ$`g9v}xf<#fA4=%i2TRVWkEQZ#@tlQyeQz~&t-as(IzB6cn#36~m3XmzBsvs^F zn`M0E%3%~I68wzMXC53FH;*E*wm27!&HDV8RFwuud=4VQ=?M}=(Zl#x*EetndkLPR zC>L#SfHW5jzTa3q0TK`C{3!_vMtJo4@KURJM0(E>u^ZS;^K=}D+V1%$;Q`>&oz1N zuk`hPI%UHl-Qc$z4eR`X~?fNZH|i2(E( z=u!g!NTpJj-QLlD0ncIn#n8&j6@#`B5|@O%{U(XAx2NZp-9{1w?x<8Q;WjE&o7+ie zMI|0R03efqL07vI4iA_bASKhOS%%R_bKMP)3cw23RSsVaA>^X%*RL3xC2J%io7HL= z8D;qo@TdXLeiDhq?QnE;cHnypghGEme`e4DRSzkegx&onrQ>pUx64jTNb*EM8jX6I zrqgA4G*vgQkk;WjXr}%f&M6xXDV530GJX}A?N--W?iYdO;h;h`3PK1uZIf5~`cA-u z(4=L|JT%Pmkgvznt%gq32Sq?4aoMLXc68t#7XDgVe)iO$16lo+xg$s?6xSZT{@R`$@D9AU{fDj-61VA9rDWF$ZcUwJfpWL|dx!a|bD-Jvm2xarxnR!Oc z?ev`o5*>O#2=ZkJ^H3-QI`NlYxm;dce#&ibR*o)WGK#upH1_wK;u*+bxko~PP5~F% zn%)s|x!l6i@^(CqFElnhq}TWE<)pbX_I@GgQZ*6O`f_avY6)ryY6)ry`u_;}7k*)} UU3ux7Qvd(}07*qoM6N<$g4%ZGG5`Po literal 0 HcmV?d00001 diff --git a/resources/android/res-jocl/layout/main.xml b/resources/android/res-jocl/layout/main.xml new file mode 100644 index 0000000..3a5f117 --- /dev/null +++ b/resources/android/res-jocl/layout/main.xml @@ -0,0 +1,12 @@ + + + + diff --git a/resources/android/res-jocl/values/strings.xml b/resources/android/res-jocl/values/strings.xml new file mode 100644 index 0000000..2403855 --- /dev/null +++ b/resources/android/res-jocl/values/strings.xml @@ -0,0 +1,8 @@ + + + Jocl Library + JogAmp\'s Jocl Library + Contains Dalvik and native code, supporting native bindings. + Jocl + The Jocl Library. + diff --git a/scripts/make.jocl.all.android-armv7-cross.sh b/scripts/make.jocl.all.android-armv7-cross.sh new file mode 100755 index 0000000..300627f --- /dev/null +++ b/scripts/make.jocl.all.android-armv7-cross.sh @@ -0,0 +1,92 @@ +#! /bin/sh + +export NODE_LABEL=. + +export HOST_UID=jogamp +# jogamp02 - 10.1.0.122 +export HOST_IP=10.1.0.122 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab03 +#export TARGET_IP=jauphone04 +export TARGET_ADB_PORT=5555 +# needs executable bit (probably su) +export TARGET_ROOT=/data/projects +export TARGET_ANT_HOME=/usr/share/ant + +echo ANDROID_SDK_HOME $ANDROID_SDK_HOME +echo NDK_ROOT $NDK_ROOT + +if [ -z "$NDK_ROOT" ] ; then + # + # Generic android-ndk + # + if [ -e /usr/local/android-ndk ] ; then + NDK_ROOT=/usr/local/android-ndk + elif [ -e /opt-linux-x86/android-ndk ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk + elif [ -e /opt/android-ndk ] ; then + NDK_ROOT=/opt/android-ndk + # + # Specific android-ndk-r7b + # + elif [ -e /usr/local/android-ndk-r7b ] ; then + NDK_ROOT=/usr/local/android-ndk-r7b + elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r7b + elif [ -e /opt/android-ndk-r7b ] ; then + NDK_ROOT=/opt/android-ndk-r7b + else + echo NDK_ROOT is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $NDK_ROOT ] ; then + echo NDK_ROOT $NDK_ROOT does not exist + exit 1 +fi +export NDK_ROOT + +if [ -z "$ANDROID_SDK_HOME" ] ; then + if [ -e /usr/local/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/usr/local/android-sdk-linux_x86 + elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 + elif [ -e /opt/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt/android-sdk-linux_x86 + else + echo ANDROID_SDK_HOME is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $ANDROID_SDK_HOME ] ; then + echo ANDROID_SDK_HOME $ANDROID_SDK_HOME does not exist + exit 1 +fi +export ANDROID_SDK_HOME + +export ANDROID_VERSION=9 +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +export GCC_VERSION=4.4.3 +HOST_ARCH=linux-x86 +export TARGET_TRIPLE=arm-linux-androideabi + +export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH} +export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm + +# Need to add toolchain bins to the PATH. +export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH" + +export GLUEGEN_CPPTASKS_FILE=`pwd`/../gluegen/make/lib/gluegen-cpptasks-android-armv7.xml + +#export JUNIT_DISABLED="true" +#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +# BUILD_ARCHIVE=true \ +ant \ + -Drootrel.build=build-android-armv7 \ + $* 2>&1 | tee -a make.jocl.all.android-armv7-cross.log +