ci: 更新构建脚本

qwertyyb · Oct 26, 2023 · 257c4da · 257c4da
1 parent 978a026
commit 257c4da
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 32 deletions.
diff --git a/Fire.xcodeproj/project.pbxproj b/Fire.xcodeproj/project.pbxproj
@@ -185,7 +185,6 @@
 				67C9A02D2AB53ED3000B5281 /* CandidatesWindow.swift */,
 				67C9A01D2AB53ED2000B5281 /* DictManager.swift */,
 				67C9A0142AB53ED2000B5281 /* en.lproj */,
-				67C9A0222AB53ED3000B5281 /* FireInputServer.swift */,
 				67C9A01A2AB53ED2000B5281 /* FireMenu.swift */,
 				67C9A0192AB53ED2000B5281 /* Info.plist */,
 				67C9A0242AB53ED3000B5281 /* Preferences */,
@@ -195,6 +194,7 @@
 				67C9A0112AB53EB0000B5281 /* Table */,
 				67C9A0052AB53E83000B5281 /* fire.pdf */,
 				67C9A0062AB53E83000B5281 /* Fire.swift */,
+				67C9A0222AB53ED3000B5281 /* FireInputServer.swift */,
 				67C9A0072AB53E83000B5281 /* FireInputController.swift */,
 				67C9A0022AB53E83000B5281 /* InputSource.swift */,
 				67C9A0012AB53E83000B5281 /* MainMenu.xib */,

diff --git a/Fire/Info.plist b/Fire/Info.plist
@@ -17,13 +17,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>v0.16.0</string>
+	<string>v0.17.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict/>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20230916151454</string>
+	<string>20230918181732</string>
 	<key>ComponentInputModeDict</key>
 	<dict>
 		<key>tsInputModeListKey</key>

diff --git a/package/component.plist b/package/component.plist
diff --git a/scripts/b_build_installer.sh b/scripts/b_build_installer.sh
@@ -27,9 +27,9 @@ echo $INSTALLER_ROOT
 if [[ $USE_CODE_SIGN == "disable" ]]
 then
     echo "build installer without signing"
-    pkgbuild --info "${PROJECT_ROOT}/package/PackageInfo" --root "${INSTALLER_ROOT}" --component-plist "${PROJECT_ROOT}/package/component.plist" --identifier "${BUNDLE_IDENTIFIER}" --version "${Version}" --install-location "${INSTALL_LOCATION}" --scripts "${PROJECT_ROOT}/package/scripts" "$EXPORT_INSTALLER"
+    pkgbuild --info "${PROJECT_ROOT}/package/PackageInfo" --root "${INSTALLER_ROOT}" --identifier "${BUNDLE_IDENTIFIER}" --version "${Version}" --install-location "${INSTALL_LOCATION}" --scripts "${PROJECT_ROOT}/package/scripts" "$EXPORT_INSTALLER" || { echo "build installer failed"; exit 1; }
 else
-    pkgbuild --info "${PROJECT_ROOT}/package/PackageInfo" --root "${INSTALLER_ROOT}" --component-plist "${PROJECT_ROOT}/package/component.plist" --identifier "${BUNDLE_IDENTIFIER}" --version "${Version}" --install-location "${INSTALL_LOCATION}" --scripts "${PROJECT_ROOT}/package/scripts" --sign "Developer ID Installer: Yongbang Yang" "$EXPORT_INSTALLER"
+    pkgbuild --info "${PROJECT_ROOT}/package/PackageInfo" --root "${INSTALLER_ROOT}" --identifier "${BUNDLE_IDENTIFIER}" --version "${Version}" --install-location "${INSTALL_LOCATION}" --scripts "${PROJECT_ROOT}/package/scripts" --sign "Developer ID Installer: Yongbang Yang" "$EXPORT_INSTALLER" || { echo "build installer failed"; exit 1; }
 fi
 
 # pack zip for update