From 49158c43cacd5b36768886bcef2728e59802b72f Mon Sep 17 00:00:00 2001 From: Rustam Zaitov Date: Mon, 30 Dec 2013 17:16:02 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=8F=D1=81=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BA=20sln=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/common/settings.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common/settings.txt b/scripts/common/settings.txt index b5e756a..2a3f50b 100644 --- a/scripts/common/settings.txt +++ b/scripts/common/settings.txt @@ -40,7 +40,7 @@ android.csproj_dir = '' android.csproj_name = '' android.remove_project = '' #оставить пустым если не надо удалять проекты. Чаще всего указывают проект Android (если он в том же солюшене) # dont change -android.sln_config = 'Release|AnyCPU' +android.sln_config = 'Release' # Нельзя указывать платформу(Release|AnyCPU). Иначе приложение не будет подписано android.steps = '{@builder_path}/scripts/common/android.txt' android.output_path = 'bin' android.publish_name = 'Android' From 68415f6313ea291a47dc0351a1b83e917892e454 Mon Sep 17 00:00:00 2001 From: Rustam Zaitov Date: Mon, 30 Dec 2013 17:33:34 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=83=D1=82=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20?= =?UTF-8?q?=D1=81=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B8=20=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BC=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/common/android prepare.txt | 4 ++-- scripts/common/ios prepare.txt | 8 ++++---- scripts/common/settings.txt | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/common/android prepare.txt b/scripts/common/android prepare.txt index bb1e28b..ba59a50 100644 --- a/scripts/common/android prepare.txt +++ b/scripts/common/android prepare.txt @@ -1,5 +1,5 @@ -inside '{@csproj_dir}/{@csproj_name}' set OutputPath to '{@output_path}' for '{@sln_config}|AnyCPU' -inside '{@csproj_dir}/{@csproj_name}' set AssemblyName to '{@project_name}' for '' +inside '{@csproj_dir}/{@csproj_file_name}' set OutputPath to '{@output_path}' for '{@sln_config}|AnyCPU' +inside '{@csproj_dir}/{@csproj_file_name}' set AssemblyName to '{@project_name}' for '' inside '{@csproj_dir}/Properties/AndroidManifest.xml' set package to '{@package_name}' inside '{@csproj_dir}/Properties/AndroidManifest.xml' set android:versionName to '{@version}.{@build}' diff --git a/scripts/common/ios prepare.txt b/scripts/common/ios prepare.txt index 0129e58..2581be6 100644 --- a/scripts/common/ios prepare.txt +++ b/scripts/common/ios prepare.txt @@ -1,9 +1,9 @@ install profile 'scripts/{@provisioning_profile}.mobileprovision' -inside '{@csproj_dir}/{@csproj_name}' set CodesignKey to '{@provisioning_account}' for '{@sln_config}' -inside '{@csproj_dir}/{@csproj_name}' set CodesignProvision to '{@provisioning_uudid}' for '{@sln_config}' -inside '{@csproj_dir}/{@csproj_name}' set OutputPath to '{@output_path}' for '{@sln_config}' -inside '{@csproj_dir}/{@csproj_name}' set AssemblyName to '{@project_name}' for '' +inside '{@csproj_dir}/{@csproj_file_name}' set CodesignKey to '{@provisioning_account}' for '{@sln_config}' +inside '{@csproj_dir}/{@csproj_file_name}' set CodesignProvision to '{@provisioning_uudid}' for '{@sln_config}' +inside '{@csproj_dir}/{@csproj_file_name}' set OutputPath to '{@output_path}' for '{@sln_config}' +inside '{@csproj_dir}/{@csproj_file_name}' set AssemblyName to '{@project_name}' for '' inside '{@csproj_dir}/Info.plist' set CFBundleVersion to '{@version}.{@build}' inside '{@csproj_dir}/Info.plist' set CFShortBundleVersion to '{@version}' diff --git a/scripts/common/settings.txt b/scripts/common/settings.txt index 2a3f50b..b945108 100644 --- a/scripts/common/settings.txt +++ b/scripts/common/settings.txt @@ -20,10 +20,12 @@ configs = 'default_ios, appstore, default_android, googleplay' # следует перенести в ios и android конфигурации sln_path = '' +csproj_file_name = '{@csproj_name}.csproj' # dont change + # required ios.provisioning_uudid = '' # Можно использовать пробел для режима Automatic ios.csproj_dir = '' -ios.csproj_name = '' +ios.csproj_name = '' # только имя проекта, обычно имя файла без расширения ios.remove_project = '' #оставить пустым если не надо удалять проекты. Чаще всего указывают проект Android (если он в том же солюшене) # dont change ios.sln_config = 'Release|iPhone' @@ -37,7 +39,7 @@ ios.appstore.provisioning_profile = 'distribution' # dont change # required android.csproj_dir = '' -android.csproj_name = '' +android.csproj_name = '' # только имя проекта, обычно имя файла без расширения android.remove_project = '' #оставить пустым если не надо удалять проекты. Чаще всего указывают проект Android (если он в том же солюшене) # dont change android.sln_config = 'Release' # Нельзя указывать платформу(Release|AnyCPU). Иначе приложение не будет подписано