Update build scripts

CMakeLists.txt

@@ -104,7 +104,7 @@ FIND_PACKAGE(QuickJS REQUIRED)
 INCLUDE_DIRECTORIES(${QUICKJS_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(subconverter ${QUICKJS_LIBRARIES})
 
-FIND_PACKAGE(libcron REQUIRED)
+FIND_PACKAGE(LibCron REQUIRED)
 INCLUDE_DIRECTORIES(${LIBCRON_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(subconverter ${LIBCRON_LIBRARIES})
 

cmake/FindLibCron.cmake

@@ -1,13 +1,13 @@
 find_path(LIBCRON_INCLUDE_DIR libcron/Cron.h)
 find_path(DATE_INCLUDE_DIR date/date.h)
 
-find_library(LIBCRON_LIBRARY liblibcron)
+find_library(LIBCRON_LIBRARY libcron)
 
 set(LIBCRON_LIBRARIES "${LIBCRON_LIBRARY}")
 set(LIBCRON_INCLUDE_DIRS "${LIBCRON_INCLUDE_DIR} ${DATE_INCLUDE_DIR}")
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(libcron DEFAULT_MSG
+find_package_handle_standard_args(LibCron DEFAULT_MSG
     LIBCRON_INCLUDE_DIRS LIBCRON_LIBRARY)
 
 mark_as_advanced(LIBCRON_INCLUDE_DIRS)

cmake/FindQuickJS.cmake

@@ -1,6 +1,6 @@
 find_path(QUICKJS_INCLUDE_DIRS quickjs/quickjs.h)
 
-find_library(QUICKJS_LIBRARY libquickjs)
+find_library(QUICKJS_LIBRARY quickjs)
 
 set(QUICKJS_LIBRARIES "${QUICKJS_LIBRARY}")
 

scripts/Dockerfile

@@ -9,16 +9,17 @@ RUN apk add --no-cache --virtual .build-tools git g++ build-base linux-headers c
     cd quickjspp && \
 	git submodule update --init && \
     cmake -DCMAKE_BUILD_TYPE=Release . && \
-    make -j4 && \
+    make -j2 && \
     install -m644 quickjs/libquickjs.a /usr/lib && \
-    install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/include/quickjs && \
+	install -d /usr/include/quickjs/ && \
+    install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/include/quickjs/ && \
     install -m644 quickjspp.hpp /usr/include && \
     cd .. && \
     git clone https://github.com/PerMalmberg/libcron --depth=1 && \
     cd libcron && \
     cmake -DCMAKE_BUILD_TYPE=Release . && \
     make -j4 && \
-    install -m644 libcron/out/Release/liblibcron.a /usr/lib && \
+    install -m644 libcron/out/Release/liblibcron.a /usr/lib/ && \
     install -d /usr/include/libcron/ && \
     install -m644 libcron/include/libcron/* /usr/include/libcron/ && \
     install -d /usr/include/date/ && \

scripts/build.alpine.release.sh

@@ -19,18 +19,19 @@ cd ..
 git clone https://github.com/ftk/quickjspp --depth=1
 cd quickjspp
 cmake -DCMAKE_BUILD_TYPE=Release .
-make -j4
-install -m644 quickjs/libquickjs.a /usr/lib
-install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/include/quickjs
-install -m644 quickjspp.hpp /usr/include
+make quickjs -j2
+install -m644 quickjs/libquickjs.a /usr/lib/
+install -d /usr/include/quickjs/
+install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/include/quickjs/
+install -m644 quickjspp.hpp /usr/include/
 cd ..
 
 git clone https://github.com/PerMalmberg/libcron --depth=1
 cd libcron
 git submodule update --init
 cmake -DCMAKE_BUILD_TYPE=Release .
-make -j4
-install -m644 libcron/out/Release/liblibcron.a /usr/lib
+make libcron -j2
+install -m644 libcron/out/Release/liblibcron.a /usr/lib/
 install -d /usr/include/libcron/
 install -m644 libcron/include/libcron/* /usr/include/libcron/
 install -d /usr/include/date/

scripts/build.macos.release.sh

@@ -20,16 +20,19 @@ cd ..
 git clone https://github.com/ftk/quickjspp --depth=1
 cd quickjspp
 cmake -DCMAKE_BUILD_TYPE=Release .
-make -j4
-install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/local/include/quickjs
-install -m644 quickjspp.hpp /usr/local/include
+make quickjs -j8
+install -m644 quickjs/libquickjs.a /usr/local/lib/
+install -d /usr/local/include/quickjs/
+install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/local/include/quickjs/
+install -m644 quickjspp.hpp /usr/local/include/
 cd ..
 
 git clone https://github.com/PerMalmberg/libcron --depth=1
 cd libcron
 git submodule update --init
 cmake -DCMAKE_BUILD_TYPE=Release .
-make -j4
+make libcron -j8
+install -m644 libcron/out/Release/liblibcron.a /usr/local/lib/
 install -d /usr/local/include/libcron/
 install -m644 libcron/include/libcron/* /usr/local/include/libcron/
 install -d /usr/local/include/date/

scripts/build.windows.release.sh

@@ -17,18 +17,19 @@ git clone https://github.com/ftk/quickjspp --depth=1
 cd quickjspp
 patch quickjs/quickjs-libc.c -i ../scripts/patches/0001-quickjs-libc-add-realpath-for-Windows.patch
 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .
-make -j4
-install -m644 quickjs/libquickjs.a "$MINGW_PREFIX/lib"
-install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h "$MINGW_PREFIX/include/quickjs"
-install -m644 quickjspp.hpp "$MINGW_PREFIX/include"
+make quickjs -j4
+install -m644 quickjs/libquickjs.a "$MINGW_PREFIX/lib/"
+install -d "$MINGW_PREFIX/include/quickjs"
+install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h "$MINGW_PREFIX/include/quickjs/"
+install -m644 quickjspp.hpp "$MINGW_PREFIX/include/"
 cd ..
 
 git clone https://github.com/PerMalmberg/libcron --depth=1
 cd libcron
 git submodule update --init
 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .
-make -j4
-install -m644 libcron/out/Release/liblibcron.a "$MINGW_PREFIX/lib"
+make libcron -j4
+install -m644 libcron/out/Release/liblibcron.a "$MINGW_PREFIX/lib/"
 install -d "$MINGW_PREFIX/include/libcron/"
 install -m644 libcron/include/libcron/* "$MINGW_PREFIX/include/libcron/"
 install -d "$MINGW_PREFIX/include/date/"