Merge pull request #376 from Stremio/notarytool

Use notarytool instead of altool and rcedit instead of ResourceHacker

Author: core1024

.gitignore

@@ -56,3 +56,4 @@ icons
 server.js
 Stremio*.exe
 
+rcedit-x86.exe

appveyor.yml

@@ -30,11 +30,8 @@ install:
       del $file
   - set OPENSSL_BIN_PATH=C:\OpenSSL-Win32\bin
 
-  # Install Resource Hacker
-  - ps: $env:RH_INSTALLER = "reshacker_setup.exe"
-  - ps: Start-FileDownload "http://www.angusj.com/resourcehacker/$env:RH_INSTALLER"
-  - ps: Start-Process "$env:RH_INSTALLER" -ArgumentList "/silent /verysilent /sp- /suppressmsgboxes /dir=C:\RH" -Wait
-  - ps: del "$env:RH_INSTALLER"
+  # Download rcedit
+  - ps: Start-FileDownload "https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x86.exe"
 
   # Temp debugging
   - ps: $env:DLL_DIR = "windows"

mac/notarizer.sh

@@ -15,36 +15,14 @@ TEAM_ID="$4"
 echo Compresing...
 ditto -c -k --rsrc --keepParent "$APP_PATH" "$ZIP_PATH"
 
-echo Sending notarizing request...
-REQUEST=$(xcrun altool --notarize-app -t osx -f "$ZIP_PATH" --primary-bundle-id com.smartcodeltd.stremio -u "$USER" -p "$PASS" --asc-provider "$TEAM_ID" | awk '/RequestUUID =/ { print $3 }')
+echo "Create keychain profile"
+xcrun notarytool store-credentials "notarytool-profile" --apple-id "$USER" --team-id "$TEAM_ID" --password "$PASS"
 
-echo Got request ID: $REQUEST
+echo Sending notarizing request...
+xcrun notarytool submit "$ZIP_PATH" --keychain-profile "notarytool-profile" --wait
 
 rm "$ZIP_PATH"
 
-#get_status() {
-#	xcrun altool --notarization-info "$REQUEST" -u "$USER" -p "$PASS" | awk '/Status:/ { print $2 }'
-#}
-#
-#echo Checking notarizing response...
-#STATUS="$(get_status)" 
-#while [ "$STATUS" == "in progress" ]; do
-#	sleep 30
-#	echo Not ready yet. Checking again...
-#	STATUS="$(get_status)" 
-#done
-#
-#echo Status: $STATUS
-#
-#if [ "$STATUS" != "success" ]; then
-#	exit 1
-#fi
-echo Waiting for notarization...
-sleep 480
-
-echo Check the notarization status...
-xcrun altool --notarization-info "$REQUEST" -u "$USER" -p "$PASS"
-
 echo Stapling the app...
 xcrun stapler staple "$APP_PATH"
 echo Done.

windows/generate_stremio-runtime.cmd

@@ -9,57 +9,35 @@ set rh="C:\RH\ResourceHacker.exe"
 set node="C:\Program Files (x86)\nodejs\node.exe"
 
 pushd %~dp0
+set rcedit="%cd%\..\rcedit-x86.exe"
 pushd ..\images
 set rt_icon="%cd%\stremio_gray.ico"
 popd
 popd
 
 :: Check if all paths are correct
-if not exist %rh% goto :norh
+if not exist %rcedit% goto :norcedit
 if not exist %node% goto :nonode
 if not exist %rt_icon% goto :noico
 if not exist "%rt_path%\" goto :nodir
 
-:: Create temp dir
-set "res_dir=%TEMP%\srres"
-md "%res_dir%"
+:: Copy node.exe to the dist dir and remove signature
+copy %node% "%rt_exe%"
+signtool remove /s %rt_exe%
 
-:: Copy node.exe to the temp dir and remove signature
-copy %node% "%res_dir%\node.exe"
-set node="%res_dir%\node.exe"
-signtool remove /s %node%
-
-:: Extract Node.js resources
-%rh% -open %node% -save "%res_dir%\resources.rc" -action extract -mask ",,"
-
-:: Replace desired resources
-copy /D /Y %rt_icon% "%res_dir%\ICON1_1.ico"
-
-set textFile="%res_dir%\resources.rc"
-for /f "delims=" %%i in ('type "%textFile%" ^& break ^> "%textFile%" ') do (
-    set "line=%%i"
-    setlocal enabledelayedexpansion
-    set line=!line:Node.js=Stremio Runtime!
-    >>"%textFile%" echo !line:node.exe=stremio-runtime.exe!
-    endlocal
-)
-
-:: Compile new resource file
-pushd "%res_dir%"
-%rh% -open .\resources.rc -save .\stremio-rt.res -action compile
-popd
-
-:: Build the stremio-runtime executable
-%rh% -open %node% -saveas %rt_exe% -action addoverwrite -res "%res_dir%\stremio-rt.res"
-
-:: Cleanup
-rd /S /Q "%res_dir%"
-exit /b 0
+:: Patch the exe
+%rcedit% %rt_exe% ^
+--set-icon %rt_icon% ^
+--set-version-string "ProductName" "StremioRuntime" ^
+--set-version-string "FileDescription" "Stremio Server JavaScript Runtime" ^
+--set-version-string "OriginalFilename" "stremio-runtime.exe" ^
+--set-version-string "InternalName" "stremio-runtime"
+exit /b %errorlevel%
 
 :: Error states
 
-:norh
-echo ResourceHacker.exe not found at %rh%
+:norcedit
+echo rcedit-x86.exe not found at %rcedit%
 exit /b 1
 
 :nonode