Merge pull request #147 from autc04/nix-ci

Set up azure pipelines CI tasks for NIx

Samples/SharedLibrary/CMakeLists.txt

@@ -52,12 +52,16 @@ add_custom_command(
 
 # Step 4: Combine the PEF data fork with a resource fork containing a cfrg resource:
 
+if (REZ_INCLUDE_PATH)
+    set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH})
+endif()
+
 add_custom_command(
     OUTPUT Library.bin Library Library.dsk Library.ad "%Library.ad"
     COMMAND ${REZ} 
             ${REZ_FLAGS}
             ${CMAKE_CURRENT_SOURCE_DIR}/library.r
-            -I${REZ_INCLUDE_PATH}
+            ${REZ_INCLUDE_FLAG}
             -o "Library.bin" --cc "Library.dsk" --cc "Library"
             --cc "%Library.ad"
             -t "shlb" -c "????"

azure-pipelines.yml

@@ -61,3 +61,43 @@ jobs:
       testResultsFormat: 'CTest'
       testResultsFiles: build/Testing/**/*.xml
       buildPlatform: 'x86_64-macos'
+
+- job: nix_68k
+  pool:
+    vmImage: 'ubuntu-20.04'
+  steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      docker run -i --name nix -v`pwd`:/src nixos/nix:latest <<EOF
+        nix-channel --add https://nixos.org/channels/nixos-21.11 nixpkgs
+        nix-channel --update
+        nix-build src -A m68k.retro68.samples
+      EOF
+    displayName: Build inside nixos/nix docker
+  - script: |
+      docker cp -L nix:result - | tar x --strip-components 1
+    displayName: Copy result out of docker
+
+  - publish: Applications
+    artifact: 68K Applications
+    
+
+- job: nix_ppc
+  pool:
+    vmImage: 'ubuntu-20.04'
+  steps:
+  - checkout: self
+    submodules: true
+  - script: |
+      docker run -i --name nix -v`pwd`:/src nixos/nix:latest <<EOF
+        nix-channel --add https://nixos.org/channels/nixos-21.11 nixpkgs
+        nix-channel --update
+        nix-build src -A powerpc.retro68.samples
+      EOF
+    displayName: Build inside nixos/nix docker
+  - script: |
+      docker cp -L nix:result - | tar x --strip-components 1
+    displayName: Copy result out of docker
+  - publish: Applications
+    artifact: PowerPC Applications

cmake/add_application.cmake

@@ -93,7 +93,7 @@ function(add_application name)
             OUTPUT ${name}.bin ${name}.APPL ${name}.dsk ${name}.ad "%${name}.ad"
             COMMAND ${REZ} ${REZ_FLAGS}
                     ${REZ_TEMPLATES_PATH}/Retro68APPL.r
-                    -I${REZ_INCLUDE_PATH}
+                    ${rez_include_options}
                     --copy "${name}.code.bin"
                     -o "${name}.bin"
                     -t "${ARGS_TYPE}" -c "${ARGS_CREATOR}"
@@ -120,7 +120,7 @@ function(add_application name)
             COMMAND ${REZ} 
                     ${REZ_FLAGS}
                     ${REZ_TEMPLATE}
-                    -I${REZ_INCLUDE_PATH}
+                    ${rez_include_options}
                     -DCFRAG_NAME="\\"${name}\\""
                     -o "${name}.bin" --cc "${name}.dsk" --cc "${name}.APPL"
                     --cc "%${name}.ad"