fix scripts

.github/workflows/main.yml

@@ -12,21 +12,17 @@ on:
       - 'web/**'
       - '**.md'
 jobs:
-  build_win32_amalgamated:
+  # build_win32_amalgamated:
-    runs-on: windows-latest
+  #   runs-on: windows-latest
-    steps:
+  #   steps:
-    - uses: actions/checkout@v4
+  #   - uses: actions/checkout@v4
-    - uses: ilammy/msvc-dev-cmd@v1
+  #   - uses: ilammy/msvc-dev-cmd@v1
-    - name: Compile
+  #   - name: Compile
-      shell: powershell
+  #     shell: powershell
-      run: |
+  #     run: |
-        python amalgamate.py
+  #       python amalgamate.py
-        cd amalgamated
+  #       cd amalgamated
-        cl.exe /std:c++17 /EHsc /utf-8 /Ox /I. /DPK_ENABLE_OS=1 main.cpp /link /out:pkpy.exe
+  #       cl.exe /std:c++17 /EHsc /utf-8 /Ox /I. /DPK_ENABLE_OS=1 main.cpp /link /out:pkpy.exe
-    # - uses: actions/upload-artifact@v4
-    #   with:
-    #     name: amalgamated
-    #     path: amalgamated/pkpy.exe
   build_win32:
     runs-on: windows-latest
     steps:
@@ -109,16 +105,16 @@ jobs:
           python scripts/run_tests.py
       - name: Benchmark
         run: python scripts/run_tests.py benchmark
-      - run: |
+      # - run: |
-          python amalgamate.py
+      #     python amalgamate.py
-          cd plugins/macos/pocketpy
+      #     cd plugins/macos/pocketpy
-          mkdir output
+      #     mkdir output
-          xcodebuild clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+      #     xcodebuild clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
-          cp -r build/Release/pocketpy.bundle output
+      #     cp -r build/Release/pocketpy.bundle output
-      - uses: actions/upload-artifact@v4
+      # - uses: actions/upload-artifact@v4
-        with:
+      #   with:
-          name: macos
+      #     name: macos
-          path: plugins/macos/pocketpy/output
+      #     path: plugins/macos/pocketpy/output
   build_android:
       runs-on: ubuntu-latest
       steps:

run_profile.sh

@@ -1,5 +1,9 @@
 python prebuild.py
-SRC=$(find src/ -name "*.cpp")
+
+SRC_C=$(find src/ -name "*.c")
+SRC_CPP=$(find src/ -name "*.cpp")
+SRC="$SRC_C $SRC_CPP"
+
 g++ -pg -Og -std=c++17 -frtti -Wfatal-errors -o main $SRC src2/main.cpp -Iinclude
 ./main benchmarks/fib.py
 gprof main gmon.out > gprof.txt

run_tests.sh

@@ -1,5 +1,9 @@
 python prebuild.py
-SRC=$(find src/ -name "*.cpp")
+
+SRC_C=$(find src/ -name "*.c")
+SRC_CPP=$(find src/ -name "*.cpp")
+SRC="$SRC_C $SRC_CPP"
+
 clang++ -std=c++17 --coverage -O1 -stdlib=libc++ -frtti -Wfatal-errors -o main src2/main.cpp $SRC -Iinclude -DPK_ENABLE_OS=1 -DPK_DEBUG_PRECOMPILED_EXEC=1 -DPK_ENABLE_PROFILER=1
 
 python scripts/run_tests.py