more fixes for export

sakkaku-dev · Aug 4, 2023 · ca4e36e · ca4e36e
1 parent be1fb1c
commit ca4e36e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 32 deletions.
diff --git a/godot/export_presets.cfg b/godot/export_presets.cfg
@@ -13,23 +13,19 @@ encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
-script_encryption_key=""
 
 [preset.0.options]
 
 custom_template/debug=""
 custom_template/release=""
-debug/export_console_script=1
+debug/export_console_wrapper=1
 binary_format/embed_pck=false
 texture_format/bptc=false
 texture_format/s3tc=true
 texture_format/etc=false
 texture_format/etc2=false
 binary_format/architecture="x86_64"
 codesign/enable=false
-codesign/identity_type=0
-codesign/identity=""
-codesign/password=""
 codesign/timestamp=true
 codesign/timestamp_server_url=""
 codesign/digest_algorithm=1
@@ -63,6 +59,7 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi
 ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
 Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
 Remove-Item -Recurse -Force '{temp_dir}'"
+debug/export_console_script=1
 
 [preset.1]
 
@@ -79,13 +76,12 @@ encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
-script_encryption_key=""
 
 [preset.1.options]
 
 custom_template/debug=""
 custom_template/release=""
-debug/export_console_script=1
+debug/export_console_wrapper=1
 binary_format/embed_pck=false
 texture_format/bptc=false
 texture_format/s3tc=true
@@ -104,6 +100,7 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
 ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
 kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
 rm -rf \"{temp_dir}\""
+debug/export_console_script=1
 
 [preset.2]
 
@@ -120,7 +117,6 @@ encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
-script_encryption_key=""
 
 [preset.2.options]
 
@@ -134,12 +130,6 @@ architectures/armeabi-v7a=true
 architectures/arm64-v8a=true
 architectures/x86=false
 architectures/x86_64=false
-keystore/debug="debug.keystore"
-keystore/debug_user="androiddebugkey"
-keystore/debug_password="android"
-keystore/release=""
-keystore/release_user=""
-keystore/release_password=""
 version/code=1
 version/name="1.0"
 package/unique_name="io.github.kumagee.$genname"
@@ -316,20 +306,19 @@ permissions/write_user_dictionary=false
 
 [preset.3]
 
-name="Web"
+name="web"
 platform="Web"
 runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter="addons/gut/*,tests/*"
-export_path="build/Web/index.html"
+export_path="build/web/index.html"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
-script_encryption_key=""
 
 [preset.3.options]
 
@@ -368,14 +357,14 @@ encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
-script_encryption_key=""
 
 [preset.4.options]
 
+export/distribution_type=1
 binary_format/architecture="universal"
 custom_template/debug=""
 custom_template/release=""
-debug/export_console_script=1
+debug/export_console_wrapper=1
 application/icon=""
 application/icon_interpolation=4
 application/bundle_identifier="io.github.kuma-gee"
@@ -385,11 +374,18 @@ application/short_version="1.0"
 application/version="1.0"
 application/copyright=""
 application/copyright_localized={}
+application/min_macos_version="10.12"
 display/high_res=true
+xcode/platform_build="14C18"
+xcode/sdk_version="13.1"
+xcode/sdk_build="22C55"
+xcode/sdk_name="macosx13.1"
+xcode/xcode_version="1420"
+xcode/xcode_build="14C18"
 codesign/codesign=1
+codesign/installer_identity=""
+codesign/apple_team_id=""
 codesign/identity=""
-codesign/certificate_file=""
-codesign/certificate_password=""
 codesign/entitlements/custom_file=""
 codesign/entitlements/allow_jit_code_execution=false
 codesign/entitlements/allow_unsigned_executable_memory=false
@@ -415,12 +411,6 @@ codesign/entitlements/app_sandbox/files_movies=0
 codesign/entitlements/app_sandbox/helper_executables=[]
 codesign/custom_options=PackedStringArray()
 notarization/notarization=0
-notarization/apple_id_name=""
-notarization/apple_id_password=""
-notarization/apple_team_id=""
-notarization/api_uuid=""
-notarization/api_key=""
-notarization/api_key_id=""
 privacy/microphone_usage_description=""
 privacy/microphone_usage_description_localized={}
 privacy/camera_usage_description=""
@@ -454,3 +444,5 @@ open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}"
 ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
 kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\")
 rm -rf \"{temp_dir}\""
+debug/export_console_script=1
+notarization/apple_team_id=""
diff --git a/scripts/publish.sh b/scripts/publish.sh
@@ -5,7 +5,7 @@
 # github-cli
 # butler
 
-GAME="##VAR_GAME_NAME"
+GAME="##VAR_GAME"
 VERSION="$1"
 
 ARGS=("$@")
@@ -38,9 +38,9 @@ build_channels() {
 }
 
 github_release() {
-    echo "Releasing version $VERSION to github for $CHANNELS"
+    echo "Releasing version $VERSION to github"
 
-    cd godot/build
+    cd build
     mkdir -p gh-releases
     for CHANNEL in "${CHANNELS[@]}"; do
         echo "Archiving $CHANNEL"
@@ -55,11 +55,11 @@ github_release() {
 }
 
 itch_release() {
-    echo "Releasing version $VERSION to itch.io for $CHANNELS"
+    echo "Releasing version $VERSION to itch.io"
 
     for CHANNEL in "${CHANNELS[@]}"; do
         echo "Releasing $CHANNEL"
-        butler push godot/build/$CHANNEL kuma-gee/$GAME:$CHANNEL --userversion $VERSION
+        butler push build/$CHANNEL kuma-gee/$GAME:$CHANNEL --userversion $VERSION
     done
 }