From e668cde4e085bc37262d66abff02c80776fb0706 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Fri, 18 Sep 2020 13:56:49 +0800
Subject: [PATCH] Use Node JS for building duktape library

---
 .github/workflows/build.yml      | 6 ++++++
 .travis.yml                      | 4 ++--
 scripts/build.windows.release.sh | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2265fb..b1722c5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,9 @@ jobs:
         shell: msys2 {0}
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2-beta
+      with:
+        node-version: '12'
     - uses: msys2/setup-msys2@v2
       with:
         update: true
@@ -69,6 +72,9 @@ jobs:
         shell: msys2 {0}
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2-beta
+      with:
+        node-version: '12'
     - uses: msys2/setup-msys2@v2
       with:
         update: true
diff --git a/.travis.yml b/.travis.yml
index ca6246e..20a2946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,7 @@ jobs:
       - |-
          [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
          choco uninstall -y mingw
-         choco upgrade --no-progress -y msys2
+         choco upgrade --no-progress -y msys2 nodejs
          export msys2='cmd //C RefreshEnv.cmd '
          export msys2+='& set MSYS=winsymlinks:nativestrict '
          export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
@@ -122,7 +122,7 @@ jobs:
       - |-
          [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
          choco uninstall -y mingw
-         choco upgrade --no-progress -y msys2
+         choco upgrade --no-progress -y msys2 nodejs
          export msys2='cmd //C RefreshEnv.cmd '
          export msys2+='& set MSYS=winsymlinks:nativestrict '
          export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
diff --git a/scripts/build.windows.release.sh b/scripts/build.windows.release.sh
index 72d6b40..f8c4c41 100644
--- a/scripts/build.windows.release.sh
+++ b/scripts/build.windows.release.sh
@@ -15,10 +15,10 @@ cd ..
 
 git clone https://github.com/svaarala/duktape --depth=1
 cd duktape
-pip2 install PyYAML
-mkdir dist
+make -C src-tools
 python2 util/dist.py
-cd dist/source/src
+node src-tools/index.js dist --output-directory dist
+cd dist/src
 gcc -c -O3 -o duktape.o duktape.c
 gcc -c -O3 -o duk_module_node.o -I. ../extras/module-node/duk_module_node.c
 ar cr libduktape.a duktape.o
@@ -26,7 +26,7 @@ ar cr libduktape_module.a duk_module_node.o
 install -m0644 ./*.a "$MINGW_PREFIX/lib"
 install -m0644 ./duk*.h "$MINGW_PREFIX/include"
 install -m0644 ../extras/module-node/duk_module_node.h "$MINGW_PREFIX/include"
-cd ../../../..
+cd ../../..
 
 git clone https://github.com/Tencent/rapidjson --depth=1
 cd rapidjson