Run the bootstrap batch script in CI

Author: vossjannik

.github/workflows/java.yml

@@ -1,4 +1,4 @@
-name: Build Java project (CI for the C++ part not implemented, yet)
+name: Build C++ DLL and Java Maven project
 
 on: push
 
@@ -17,24 +17,25 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: ${{ env.JAVA_VERSION }}
-
-    - name: 'Clear'
-      shell: cmd
+  
+    - name: 'Create "dependencies" directory'
+      shell: pwsh
       run: |
-        CALL run\clear.bat
-
-    - name: 'Build Java'
-      shell: cmd
+        [IO.Directory]::CreateDirectory("dependencies")
+  
+    - name: 'The ADS API is available as a secret. It is a base64-encoded .zip file.'
+      shell: pwsh
+      env:
+        ADS_API_ZIP_BASE64: ${{ secrets.ADS_API_ZIP_BASE64 }}
       run: |
-        CALL run\build_java.bat
-
-    - name: 'Build Documentation'
-      shell: cmd
+        [IO.File]::WriteAllBytes("dependencies\AdsApi.zip", [Convert]::FromBase64String("$env:ADS_API_ZIP_BASE64"))
+  
+    - name: 'Put the contents of the "AdsApi.zip" archive into the "dependencies" directory.'
+      shell: pwsh
       run: |
-        CALL run\build_doc.bat
+        Expand-Archive "dependencies\AdsApi.zip" -DestinationPath dependencies\
 
-    - name: 'Build Samples'
+    - name: 'Run the bootstrap batch script'
       shell: cmd
       run: |
-        CALL run\build_samples.bat
-
+        CALL bootstrap.bat

.gitignore

@@ -3,6 +3,7 @@ build_win32/
 build_x64/
 target/
 dist/
+dependencies/
 node_modules/
 Testing/
 samples/[0-9][0-9]_*/*.class

cpp/CMakeLists.txt

@@ -57,7 +57,14 @@ else()
     target_include_directories(AdsToJava PRIVATE "$ENV{JAVA_HOME}/include/unix/")
 endif()
 
-if (WIN32)
+if (EXISTS "dependencies")
+    target_include_directories(AdsToJava PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/AdsApi/TcAdsDll/Include/")
+    if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
+        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" "libTcAdsDll" HINTS "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/AdsApi/TcAdsDll/Lib/" REQUIRED)
+    else()
+        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" "libTcAdsDll" HINTS "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/AdsApi/TcAdsDll/Lib/x64/" REQUIRED)
+    endif()
+elseif (WIN32)
     get_filename_component(TWINCAT_INSTALL_DIR "[HKEY_CURRENT_USER\\Software\\Beckhoff\\TwinCAT3\\3.1;InstallDir]" REALPATH)
     if(NOT EXISTS "${TWINCAT_INSTALL_DIR}/../AdsApi/TcAdsDll")
         get_filename_component(TWINCAT_INSTALL_DIR "[HKEY_LOCAL_MACHINE\\Software\\Beckhoff\\TwinCAT3\\3.1;InstallDir]" REALPATH)
@@ -68,6 +75,7 @@ if (WIN32)
             endif()
         endif()
     endif()
+
     if(EXISTS "${TWINCAT_INSTALL_DIR}/sdk/Include")
         # preferring the sdk/Include directory because the header files from ../AdsApi/TcAdsDll/Include/ might be too old
         target_include_directories(AdsToJava PRIVATE "${TWINCAT_INSTALL_DIR}/sdk/Include/")
@@ -76,16 +84,16 @@ if (WIN32)
     endif()
 
     if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" "libTcAdsDll" HINTS "${TWINCAT_INSTALL_DIR}/../AdsApi/TcAdsDll/Lib/" REQUIRED)
+        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" HINTS "${TWINCAT_INSTALL_DIR}/../AdsApi/TcAdsDll/Lib/" REQUIRED)
     else()
-        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" "libTcAdsDll" HINTS "${TWINCAT_INSTALL_DIR}/../AdsApi/TcAdsDll/Lib/x64/" "${TWINCAT_INSTALL_DIR}/../AdsApi/TcAdsDll/x64/lib/" REQUIRED)
+        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" HINTS "${TWINCAT_INSTALL_DIR}/../AdsApi/TcAdsDll/Lib/x64/" "${TWINCAT_INSTALL_DIR}/../AdsApi/TcAdsDll/x64/lib/" REQUIRED)
     endif()
 else()
     target_include_directories(AdsToJava PRIVATE "/usr/local/include/")
     if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" "libTcAdsDll" HINTS "/usr/local/lib32/" REQUIRED)
+        find_library(TC_ADS_DLL_LIBRARY NAMES "libTcAdsDll" HINTS "/usr/local/lib32/" REQUIRED)
     else()
-        find_library(TC_ADS_DLL_LIBRARY NAMES "TcAdsDll" "libTcAdsDll" HINTS "/usr/local/lib/" REQUIRED)
+        find_library(TC_ADS_DLL_LIBRARY NAMES "libTcAdsDll" HINTS "/usr/local/lib/" REQUIRED)
     endif()
 endif()
 target_link_libraries(AdsToJava "${TC_ADS_DLL_LIBRARY}")