[no ci] Change icon, temporary fix for dylib loading (#328)

* Move build directory

* Move build folder

* Move the build folder

* Update Mac OS icon

* Use snapshot icon

* Use icon file

* Temporary fix for Mac OS dylib loading

* Update require.lua

* Update require.lua

* Update require.lua

* Update require.lua

Remember to squash this.

* “简化”require模块对于OS X环境的处理方法

Co-authored-by: MrZ626 <1046101471@qq.com>

.github/workflows/build.yml

@@ -67,7 +67,7 @@ jobs:
         python .\.github\workflows\updateVersion.py -T Windows -N ${{ env.Version }}
         cmd /c '.\ResourceHacker.exe -open .\love-11.3-win64\Techmino.exe -save .\love-11.3-win64\Techmino.exe -action delete -mask ICONGROUP,,'
         cmd /c '.\ResourceHacker.exe -open .\Techmino.rc -save .\Techmino.res -action compile'
-        cmd /c '.\ResourceHacker.exe -open .\love-11.3-win64\Techmino.exe -save .\love-11.3-win64\Techmino.exe -action addoverwrite -res ".\build\Windows\icon_snapshot.ico" -mask ICONGROUP,1,'
+        cmd /c '.\ResourceHacker.exe -open .\love-11.3-win64\Techmino.exe -save .\love-11.3-win64\Techmino.exe -action addoverwrite -res ".\.github\build\Windows\icon_snapshot.ico" -mask ICONGROUP,1,'
         cmd /c '.\ResourceHacker.exe -open .\love-11.3-win64\Techmino.exe -save .\love-11.3-win64\Techmino.exe -action addoverwrite -res ".\Techmino.res" -mask VERSIONINFO,1,'
     - name: Upload
       uses: actions/upload-artifact@v2
@@ -118,9 +118,9 @@ jobs:
     - name: Pack Techmino
       run: |
         rm -rf ./squashfs-root/love ./squashfs-root/love.desktop ./squashfs-root/love.svg ./squashfs-root/.DirIcon
-        mv ./build/Linux/love.template ./squashfs-root/love
+        mv ./.github/build/Linux/love.template ./squashfs-root/love
-        mv ./build/Linux/Techmino.desktop.template ./squashfs-root/Techmino.desktop
+        mv ./.github/build/Linux/Techmino.desktop.template ./squashfs-root/Techmino.desktop
-        mv ./build/Linux/icon_snapshot.png ./squashfs-root/icon.png
+        mv ./.github/build/Linux/icon_snapshot.png ./squashfs-root/icon.png
         cp ./squashfs-root/icon.png ./squashfs-root/.DirIcon
         chmod 777 ./squashfs-root/love
         mkdir -p ./squashfs-root/usr/share/Techmino
@@ -256,6 +256,7 @@ jobs:
         python3 ./.github/workflows/updateVersion.py -T macOS -N $(lua ./.github/workflows/getVersion.lua -name)
         mv ./Techmino.love ./Techmino.app/Contents/Resources
         mv ./CCloader.dylib ./Techmino.app/Contents/Frameworks
+        mv ./.github/build/macOS/icon_snapshot.icns ./Techmino.app/Contents/Resources/iconfile.icns
     - name: Codesign executable
       # In secrets:
       #   - MACOS_CERTIFICATE: the *.p12 Developer ID Certificate, encoded in base64

.github/workflows/release.yml

@@ -178,9 +178,9 @@ jobs:
     - name: Pack Techmino
       run: |
         rm -rf ./squashfs-root/love ./squashfs-root/love.desktop ./squashfs-root/love.svg ./squashfs-root/.DirIcon
-        mv ./build/Linux/love.template ./squashfs-root/love
+        mv ./.github/build/Linux/love.template ./squashfs-root/love
-        mv ./build/Linux/Techmino.desktop.template ./squashfs-root/Techmino.desktop
+        mv ./.github/build/Linux/Techmino.desktop.template ./squashfs-root/Techmino.desktop
-        mv ./build/Linux/icon.png ./squashfs-root/icon.png
+        mv ./.github/build/Linux/icon.png ./squashfs-root/icon.png
         cp ./squashfs-root/icon.png ./squashfs-root/.DirIcon
         chmod 777 ./squashfs-root/love
         mkdir -p ./squashfs-root/usr/share/Techmino
@@ -380,6 +380,7 @@ jobs:
         python3 ./.github/workflows/updateVersion.py -T macOS -N $(lua ./.github/workflows/getVersion.lua -name)
         mv ./Techmino.love ./Techmino.app/Contents/Resources
         mv ./CCloader.dylib ./Techmino.app/Contents/Frameworks
+        mv ./.github/build/macOS/icon.icns ./Techmino.app/Contents/Resources/iconfile.icns
     - name: Codesign executable
       # In secrets:
       #   - MACOS_CERTIFICATE: the *.p12 Developer ID Certificate, encoded in base64

.github/workflows/updateVersion.py

@@ -24,7 +24,7 @@ def updateVersion(args):    #更新版本号
 def updateMacOS(args):  #更新macOS打包信息
     import datetime
     thisYear = str(datetime.datetime.today().year)
-    with open('./build/macOS/info.plist.template', 'r', encoding='utf-8') as file:
+    with open('./.github/build/macOS/info.plist.template', 'r', encoding='utf-8') as file:
         data = file.read()
         data = data\
             .replace('@versionName', args.Name)\
@@ -35,7 +35,7 @@ def updateMacOS(args):  #更新macOS打包信息
 def updateWindows(args):    #更新Windows打包信息
     Version = (args.Name).replace('V', '')
     FileVersion = (f"{Version.replace('.', ',')},0")
-    with open('./build/Windows/Techmino.rc.template', 'r', encoding='utf8') as file:
+    with open('./.github/build/Windows/Techmino.rc.template', 'r', encoding='utf8') as file:
         data = file.read()
         data = data\
             .replace('@FileVersion', FileVersion)\

Zframework/require.lua

@@ -1,7 +1,11 @@
 package.cpath=package.cpath..';'..SAVEDIR..'/lib/lib?.so;'..'?.dylib'
 local loaded={}
 return function(libName)
-    if SYSTEM=='Android'then
+    local require=require
+    if SYSTEM=='OS X'then
+        require=package.loadlib(libName..'.dylib','luaopen_'..libName)
+        libname=nil
+    elseif SYSTEM=='Android'then
         if not loaded[libName]then
             local platform=(function()
                 local p=io.popen('uname -m')
@@ -20,10 +24,10 @@ return function(libName)
             loaded[libName]=true
         end
     end
-    local r1,r2,r3=pcall(require,libName)
+    local success,res=pcall(require,libName)
-    if r1 and r2 then
+    if success and res then
-        return r2
+        return res
     else
-        MES.new('error',"Cannot load "..libName..": "..(r2 or r3))
+        MES.new('error',"Cannot load "..libName..": "..res)
     end
 end