From eb850385183e14d2f870bb46317242b9e216df9e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 21 Jan 2014 17:19:26 +0100 Subject: titaniumsdk: Replace deprecated python build tools by the new NodeJS based tool --- pkgs/development/mobile/titaniumenv/build-app.nix | 135 +++++++++++---------- pkgs/development/mobile/titaniumenv/default.nix | 26 +++- .../titaniumenv/examples/kitchensink/default.nix | 3 +- .../development/mobile/titaniumenv/titaniumsdk.nix | 2 + 4 files changed, 99 insertions(+), 67 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 068a9acedda4..ef2182135da1 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ -{stdenv, androidsdk, titaniumsdk, xcodewrapper, jdk}: -{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ] +{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python}: +{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; @@ -15,92 +15,99 @@ let }; deleteKeychain = "security delete-keychain $keychainName"; - - _appName = if appName == null then name else appName; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ titanium jdk python ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' export HOME=$TMPDIR + + ${stdenv.lib.optionalString (tiVersion != null) '' + # Replace titanium version by the provided one + sed -i -e "s|[0-9a-zA-Z\.]*|${tiVersion}|" tiapp.xml + ''} + + # Simulate a login + mkdir -p $HOME/.titanium + cat > $HOME/.titanium/auth_session.json < $TMPDIR/config.json + titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation ${titaniumsdk} mkdir -p $out ${if target == "android" then - if release then - ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' - else - ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' - + '' + titanium config --config-file $TMPDIR/config.json android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* + + ${if release then + ''titanium build --config-file $TMPDIR/config.json --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' + else + ''titanium build --config-file $TMPDIR/config.json --force --platform android --target emulator --build-only --output $out''} + '' else if target == "iphone" then - if iosDistribute then '' - export HOME=/Users/$(whoami) - export keychainName=$(basename $out) + '' + export NIX_TITANIUM_WORKAROUND="--config-file $TMPDIR/config.json" + + ${if release then + '' + export HOME=/Users/$(whoami) + export keychainName=$(basename $out) - # Create a keychain with the component hash name (should always be unique) - security create-keychain -p "" $keychainName - security default-keychain -s $keychainName - security unlock-keychain -p "" $keychainName - security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A + # Create a keychain with the component hash name (should always be unique) + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A - provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}") + provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}") - # Ensure that the requested provisioning profile can be found - - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] - then - mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" - cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" - fi + # Ensure that the requested provisioning profile can be found + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] + then + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" + fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 7.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" + # Make a copy of the Titanium SDK and fix its permissions. Without it, + # builds using the facebook module fail, because it needs to be writable - # Remove our generated keychain + cp -av ${titaniumsdk} $TMPDIR/titaniumsdk - ${deleteKeychain} - '' - else - if release then - '' - export HOME=/Users/$(whoami) - export keychainName=$(basename $out) + find $TMPDIR/titaniumsdk | while read i + do + chmod 755 "$i" + done - # Create a keychain with the component hash name (should always be unique) - security create-keychain -p "" $keychainName - security default-keychain -s $keychainName - security unlock-keychain -p "" $keychainName - security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A - - provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}") - - # Ensure that the requested provisioning profile can be found + # Set the SDK to our copy + titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation $TMPDIR/titaniumsdk - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] - then - mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" - cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" - fi + # Do the actual build + titanium build --config-file $TMPDIR/config.json --force --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 7.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + # Remove our generated keychain - # Remove our generated keychain + ${deleteKeychain} + '' + else + '' + # Copy all sources to the output store directory. + # Why? Debug application include *.js files, which are symlinked into their + # sources. If they are not copied, we have dangling references to the + # temp folder. - ${deleteKeychain} - '' - else - '' - # Copy all sources to the output store directory. - # Why? Debug application include *.js files, which are symlinked into their - # sources. If they are not copied, we have dangling references to the - # temp folder. + cp -av * $out + cd $out - cp -av * $out - cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 7.0 $(pwd) ${appId} "${_appName}" universal - '' + titanium build --config-file $TMPDIR/config.json --force --platform ios --target simulator --build-only --device-family universal --output-dir $out + ''} + '' else throw "Target: ${target} is not supported!"} ''; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 07dc2f4440d7..b77468a09536 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,5 +1,25 @@ {pkgs, pkgs_i686, xcodeVersion ? "5.0"}: +let + # We have to use Oracle's JDK. On Darwin, just simply expose the host system's + # JDK. According to their docs, OpenJDK is not supported. + + jdkWrapper = pkgs.stdenv.mkDerivation { + name = "jdk-wrapper"; + buildCommand = '' + mkdir -p $out/bin + cd $out/bin + ln -s /usr/bin/javac + ln -s /usr/bin/java + ln -s /usr/bin/jarsigner + ln -s /usr/bin/jar + ln -s /usr/bin/keytool + ''; + setupHook = '' + export JAVA_HOME=/usr + ''; + }; +in rec { androidenv = pkgs.androidenv; @@ -12,7 +32,11 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv jdk; + inherit (pkgs) stdenv python; + jdk = if pkgs.stdenv.isLinux then pkgs.oraclejdk7 + else if pkgs.stdenv.isDarwin then jdkWrapper + else throw "Platform not supported: ${pkgs.stdenv.system}"; + inherit (pkgs.nodePackages) titanium; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; inherit titaniumsdk; diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 001b91f551d2..a5cd156a8ffd 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -27,9 +27,8 @@ let in titaniumenv.buildApp { name = "KitchenSink-${target}-${if release then "release" else "debug"}"; - appName = "KitchenSink"; - appId = if rename then newBundleId else "com.appcelerator.kitchensink"; src = if rename then renamedSrc else src; + tiVersion = "3.1.4.GA"; inherit target androidPlatformVersions release; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index abf06a00fc9c..fa01dadc7756 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -72,5 +72,7 @@ stdenv.mkDerivation { '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work. sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py + + sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js ''; } -- cgit 1.4.1