Merge branch 'main' of https://github.com/blueloveTH/pocketpy

.github/workflows/dylib.yml

@@ -1,5 +1,5 @@
 name: build dylib
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build_win:
@@ -12,10 +12,9 @@ jobs:
       run: |
         Invoke-Expression (Invoke-Webrequest 'https://xmake.io/psget.text' -UseBasicParsing).Content
         mkdir -p output/windows/x86_64
-        cd dylib
-        xmake f -p windows -a x64
-        xmake
-        cp build/windows/x64/release/test.dll ../output/windows/x86_64
+        xmake f -y -p windows -a x64
+        xmake build test
+        cp build/windows/x64/release/test.dll output/windows/x86_64
     - uses: actions/upload-artifact@v3
       with:
         path: output
@@ -30,10 +29,9 @@ jobs:
     - name: Compile linux
       run: |
         mkdir -p output/linux/x86_64
-        cd dylib
-        xmake f -p linux -a x86_64
-        xmake
-        cp build/linux/x86_64/release/libtest.so ../output/linux/x86_64
+        xmake f -y -p linux -a x86_64
+        xmake build test
+        cp build/linux/x86_64/release/libtest.so output/linux/x86_64
     - uses: android-actions/setup-android@v2
     - uses: nttld/setup-ndk@v1
       id: setup-ndk
@@ -45,13 +43,12 @@ jobs:
       run: |
         mkdir -p output/android/armeabi-v7a
         mkdir -p output/android/arm64-v8a
-        cd dylib
-        xmake f -p android -a armeabi-v7a --ndk=$ANDROID_NDK_HOME
-        xmake
-        cp build/android/armeabi-v7a/release/libtest.so ../output/android/armeabi-v7a
-        xmake f -p android -a arm64-v8a --ndk=$ANDROID_NDK_HOME
-        xmake
-        cp build/android/arm64-v8a/release/libtest.so ../output/android/arm64-v8a
+        xmake f -y -p android -a armeabi-v7a --ndk=$ANDROID_NDK_HOME
+        xmake build test
+        cp build/android/armeabi-v7a/release/libtest.so output/android/armeabi-v7a
+        xmake f -y -p android -a arm64-v8a --ndk=$ANDROID_NDK_HOME
+        xmake build test
+        cp build/android/arm64-v8a/release/libtest.so output/android/arm64-v8a
       env:
         ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
     - uses: actions/upload-artifact@v3
@@ -70,13 +67,9 @@ jobs:
         run: |
           source ~/.xmake/profile
           mkdir -p output/macos/x86_64
-          cd dylib
-          xmake f -p macosx -a x86_64
-          xmake
-          cp build/macosx/x86_64/release/libtest.dylib ../output/macos/x86_64
+          xmake f -y -p macosx -a x86_64
+          xmake build test
+          cp build/macosx/x86_64/release/libtest.dylib output/macos/x86_64
       - uses: actions/upload-artifact@v3
         with:
           path: output
-
-
-

.gitignore

@@ -34,3 +34,5 @@ main
 
 pypi/
 libpocketpy.dylib
+
+.xmake/

dylib/.gitignore

@@ -1,8 +0,0 @@
-# Xmake cache
-.xmake/
-build/
-
-# MacOS Cache
-.DS_Store
-
-

dylib/xmake.lua

@@ -1,89 +1,10 @@
-add_rules("mode.debug", "mode.release")
-
 set_languages("c11")
 
-root_dir = "../"
-
--- Include directories
-add_includedirs(root_dir .. "include")
-
--- Define the shared library target for pocketpy
-target("pocketpy")
+target("pocketpy-shared")
     set_kind("shared")
-    add_files(root_dir .. "src2/pocketpy_c.c")
+    add_files(path.join(os.projectdir(), "src2", "pocketpy_c.c"))
 
--- Define the shared library target
 target("test")
     set_kind("shared")
     add_files("src/test.c")
-    add_deps("pocketpy")
-
---
--- If you want to known more usage about xmake, please see https://xmake.io
---
--- ## FAQ
---
--- You can enter the project directory firstly before building project.
---
---   $ cd projectdir
---
--- 1. How to build project?
---
---   $ xmake
---
--- 2. How to configure project?
---
---   $ xmake f -p [macosx|linux|iphoneos ..] -a [x86_64|i386|arm64 ..] -m [debug|release]
---
--- 3. Where is the build output directory?
---
---   The default output directory is `./build` and you can configure the output directory.
---
---   $ xmake f -o outputdir
---   $ xmake
---
--- 4. How to run and debug target after building project?
---
---   $ xmake run [targetname]
---   $ xmake run -d [targetname]
---
--- 5. How to install target to the system directory or other output directory?
---
---   $ xmake install
---   $ xmake install -o installdir
---
--- 6. Add some frequently-used compilation flags in xmake.lua
---
--- @code
---    -- add debug and release modes
---    add_rules("mode.debug", "mode.release")
---
---    -- add macro definition
---    add_defines("NDEBUG", "_GNU_SOURCE=1")
---
---    -- set warning all as error
---    set_warnings("all", "error")
---
---    -- set language: c99, c++11
---    set_languages("c99", "c++11")
---
---    -- set optimization: none, faster, fastest, smallest
---    set_optimize("fastest")
---
---    -- add include search directories
---    add_includedirs("/usr/include", "/usr/local/include")
---
---    -- add link libraries and search directories
---    add_links("tbox")
---    add_linkdirs("/usr/local/lib", "/usr/lib")
---
---    -- add system link libraries
---    add_syslinks("z", "pthread")
---
---    -- add compilation and link flags
---    add_cxflags("-stdnolib", "-fno-strict-aliasing")
---    add_ldflags("-L/usr/local/lib", "-lpthread", {force = true})
---
--- @endcode
---
-
+    add_deps("pocketpy-shared")

include/pocketpy/common.h

@@ -48,7 +48,7 @@ struct GIL {
     explicit GIL() { _mutex.lock(); }
     ~GIL() { _mutex.unlock(); }
 };
-#define PK_GLOBAL_SCOPE_LOCK() GIL _lock();
+#define PK_GLOBAL_SCOPE_LOCK() GIL _lock;
 
 #else
 #define PK_THREAD_LOCAL

xmake.lua

@@ -0,0 +1,49 @@
+set_project("pocketpy")
+
+set_allowedplats("windows", "linux", "macosx", "wasm", "android")
+
+option("dev", {default = true, showmenu = true, description = ""})
+
+includes("dylib")
+
+add_requires("python", {kind = "binary"})
+
+add_rules("mode.debug", "mode.release")
+
+set_languages("c++17")
+
+add_cxflags("/utf-8", {tools = "cl"})
+
+add_includedirs("include")
+
+if is_plat("linux", "macosx") then
+    add_syslinks("dl")
+end
+
+target("pocketpy")
+    if has_config("dev") then
+        set_kind("shared")
+    else
+        set_kind("$(kind)")
+    end
+
+    add_files("src/*.cpp")
+    add_headerfiles("include/(**.h)")
+
+    if is_plat("windows") and is_kind("shared") then
+        add_rules("utils.symbols.export_all")
+    end
+
+    before_build(function (target)
+        local python = assert(import("lib.detect.find_tool")("python3"), "python3 not found!")
+        os.execv(python.program, {"prebuild.py"})
+    end)
+
+target("main")
+    set_kind("binary")
+    add_files("src2/main.cpp")
+    add_deps("pocketpy")
+
+    on_load(function (target)
+        target:set("enabled", has_config("dev"))
+    end)