titaniumenv: Add parameter that configures Apple's WWDR certificate location
This commit is contained in:
parent
ca1d7dea55
commit
75175fa3eb
@ -1,7 +1,7 @@
|
|||||||
{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}:
|
{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}:
|
||||||
{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
|
{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
|
||||||
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
|
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
|
||||||
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.0"
|
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null
|
||||||
, enableWirelessDistribution ? false, installURL ? null
|
, enableWirelessDistribution ? false, installURL ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -78,7 +78,9 @@ stdenv.mkDerivation {
|
|||||||
security default-keychain -s $keychainName
|
security default-keychain -s $keychainName
|
||||||
security unlock-keychain -p "" $keychainName
|
security unlock-keychain -p "" $keychainName
|
||||||
security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
|
security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
|
||||||
|
${stdenv.lib.optionalString (iosWwdrCertificate != null) ''
|
||||||
|
security import ${iosWwdrCertificate} -k $keychainName
|
||||||
|
''}
|
||||||
provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
|
provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
|
||||||
|
|
||||||
# Ensure that the requested provisioning profile can be found
|
# Ensure that the requested provisioning profile can be found
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
, xcodeBaseDir ? "/Applications/Xcode.app"
|
, xcodeBaseDir ? "/Applications/Xcode.app"
|
||||||
, tiVersion ? "3.4.0.GA"
|
, tiVersion ? "3.4.0.GA"
|
||||||
, rename ? false
|
, rename ? false
|
||||||
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.0"
|
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.0", iosWwdrCertificate ? null
|
||||||
, allowUnfree ? false
|
, allowUnfree ? false
|
||||||
, enableWirelessDistribution ? false, installURL ? null
|
, enableWirelessDistribution ? false, installURL ? null
|
||||||
}:
|
}:
|
||||||
@ -84,7 +84,7 @@ rec {
|
|||||||
inherit tiVersion;
|
inherit tiVersion;
|
||||||
release = true;
|
release = true;
|
||||||
rename = true;
|
rename = true;
|
||||||
inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion;
|
inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate;
|
||||||
inherit enableWirelessDistribution installURL;
|
inherit enableWirelessDistribution installURL;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false
|
{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false
|
||||||
, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.0"
|
, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null
|
||||||
, enableWirelessDistribution ? false, installURL ? null
|
, enableWirelessDistribution ? false, installURL ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -37,6 +37,6 @@ titaniumenv.buildApp {
|
|||||||
androidKeyAlias = "myfirstapp";
|
androidKeyAlias = "myfirstapp";
|
||||||
androidKeyStorePassword = "mykeystore";
|
androidKeyStorePassword = "mykeystore";
|
||||||
|
|
||||||
inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion;
|
inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate;
|
||||||
inherit enableWirelessDistribution installURL;
|
inherit enableWirelessDistribution installURL;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user