lcms2 download zip folder (#5)

* Install lcms2 from archive

* Update github workflows

* Use ls instead of dir in build script

Co-authored-by: hackermd <hackermd@protonmail.com>

Author: Punzo

.github/workflows/run_unit_tests.yml

@@ -42,30 +42,35 @@ jobs:
     - name: Install yarn package manager
       run: npm install --global yarn
 
-    - name: Build and install Emscripten SDK
-      run: |
-        git clone https://github.com/emscripten-core/emsdk.git
-        cd emsdk
-        git pull
-        ./emsdk install latest
-        ./emsdk activate latest
-
     - name: Build and install library
       run: |
-        source ./emsdk/emsdk_env.sh
         mkdir build
         cd build
         cmake ..
         make
         sudo make install
 
+    - name: Build and install Emscripten SDK
+      run: |
+        git clone https://github.com/emscripten-core/emsdk.git
+        cd emsdk
+        git pull
+        ./emsdk install latest
+        ./emsdk activate latest
+        source ./emsdk_env.sh
+
     - name: Build WebAssembly bindings
       run: |
+        yarn run clean
+        sh ./emsdk/emsdk activate latest
         source ./emsdk/emsdk_env.sh
         yarn run build
 
     - name: Perform npm package publish dry run
-      run: npm publish . --dry-run
+      run: |
+        sh ./emsdk/emsdk activate latest
+        source ./emsdk/emsdk_env.sh
+        npm publish . --dry-run
 
   macos:
     name: Build and run tests on macOS
@@ -78,7 +83,16 @@ jobs:
       run: |
         brew update
         brew upgrade
-        brew install autoconf automake cmake emscripten libtool llvm node yarn
+        brew install \
+          autoconf \
+          automake \
+          cmake \
+          emscripten \
+          libtool \
+          little-cms2 \
+          llvm \
+          node \
+          yarn
 
     - name: Build and install library
       run: |
@@ -89,7 +103,9 @@ jobs:
         make install
 
     - name: Build WebAssembly bindings
-      run: yarn run build
+      run: |
+        yarn run clean
+        yarn run build
 
     - name: Perform npm package publish dry run
       run: npm publish . --dry-run

BUILDING.md

@@ -64,4 +64,4 @@ After building the WebAssembly bindings and JavaScript API, the browser based ex
 python -m SimpleHTTPServer  # Python 2
 ```
 
-and then pointing the browser to ``http://localhost:8000/browser``.
+and then pointing the browser to ``http://localhost:8000/wasm/examples/browser/``.

CMakeLists.txt

@@ -33,20 +33,7 @@ endif()
 
 if(EMSCRIPTEN)
   set(BUILD_SHARED_LIBS OFF)
-  include(ExternalProject)
-  ExternalProject_Add(lcms2
-    GIT_REPOSITORY    https://github.com/mm2/Little-CMS.git
-    GIT_TAG           master
-    BUILD_IN_SOURCE   1
-    CONFIGURE_COMMAND autoreconf -fvi && ./configure
-    BUILD_COMMAND     make
-    INSTALL_COMMAND   ""
-    TEST_COMMAND      ""
-    )
-
-  set(LCMS2_LIBRARY "${CMAKE_BINARY_DIR}/lcms2-prefix/src/lcms2/src/.libs/liblcms2.a" CACHE INTERNAL "" FORCE)
-  set(LCMS2_INCLUDE_DIR "${CMAKE_BINARY_DIR}/lcms2-prefix/src/lcms2/include" CACHE INTERNAL "" FORCE)
-
+  add_subdirectory(thirdparty)
   add_subdirectory(src)
   add_subdirectory(wasm)
 else()

build-wasm.sh

@@ -17,6 +17,6 @@ cp ./build/wasm/dicomiccwasm.js ./dist
 cp ./build/wasm/dicomiccwasm.wasm ./dist
 
 echo "~~~ BUILD:"
-(cd build && dir)
+(cd build && ls)
 echo "~~~ DIST:"
-(cd dist && dir)
+(cd dist && ls)

thirdparty/CMakeLists.txt

@@ -0,0 +1,3 @@
+message(STATUS "building lcms2 from source")
+
+add_subdirectory(liblcms2)

thirdparty/liblcms2/CMakeLists.txt

@@ -0,0 +1,15 @@
+include(ExternalProject)
+ExternalProject_Add(lcms2download
+  PREFIX            lcms2-build
+  URL               https://github.com/mm2/Little-CMS/releases/download/lcms2.13.1/lcms2-2.13.1.zip
+  URL_HASH          SHA256=4ea5cba9772182e641bf7acc2a4ee65f73b3718d47bcc4e71381e1b7b01a49d7
+  BUILD_IN_SOURCE   1
+  CONFIGURE_COMMAND autoreconf -fvi && ./configure -enable-static --prefix=${CMAKE_BINARY_DIR}/thirdparty/lcms2-install
+  BUILD_COMMAND     make
+  INSTALL_COMMAND   make install
+  TEST_COMMAND      ""
+  UPDATE_COMMAND    ""
+  )
+
+set(LCMS2_LIBRARY "${CMAKE_BINARY_DIR}/thirdparty/lcms2-install/lib/liblcms2.a" CACHE INTERNAL "" FORCE)
+set(LCMS2_INCLUDE_DIR "${CMAKE_BINARY_DIR}/thirdparty/lcms2-install/include" CACHE INTERNAL "" FORCE)

thirdparty/liblcms2/COPYING

@@ -0,0 +1,21 @@
+Little CMS
+Copyright (c) 1998-2020 Marti Maria Saguer
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be 
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.