nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

titaniumsdk: colored output makes a web server think that logs are in raw format. So disable it

Browse Source
This commit is contained in:
Sander van der Burg 2014-01-23 17:11:16 +01:00
parent 1a24278161
commit b25529a4ad
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@ -37,18 +37,18 @@ stdenv.mkDerivation {
EOF EOF
echo "{}" > $TMPDIR/config.json echo "{}" > $TMPDIR/config.json
titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation ${titaniumsdk} titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
mkdir -p $out mkdir -p $out
${if target == "android" then ${if target == "android" then
'' ''
titanium config --config-file $TMPDIR/config.json android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
${if release then ${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'' ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
else else
''titanium build --config-file $TMPDIR/config.json --force --platform android --target emulator --build-only --output $out''} ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''}
'' ''
else if target == "iphone" then else if target == "iphone" then
'' ''
@ -92,10 +92,10 @@ stdenv.mkDerivation {
EOF EOF
# Set the SDK to our copy # Set the SDK to our copy
titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation $TMPDIR/titaniumsdk titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
# Do the actual build # 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 titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out
# Remove our generated keychain # Remove our generated keychain
@ -111,7 +111,7 @@ stdenv.mkDerivation {
cp -av * $out cp -av * $out
cd $out cd $out
titanium build --config-file $TMPDIR/config.json --force --platform ios --target simulator --build-only --device-family universal --output-dir $out titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --output-dir $out
''} ''}
'' ''