Enable nightly builds of .deb packages and macOS bundles (both x86_64)

McStasMcXtrace · Dec 12, 2023 · 2b1ef62 · 2b1ef62
1 parent 5efd9b7
commit 2b1ef62
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 19 deletions.
diff --git a/buildscripts/build_debs_mcstas b/buildscripts/build_debs_mcstas
@@ -26,7 +26,7 @@ do
  fi
 done
 
-WORK=`pwd`
+export WORK=`pwd`
 
 # From 2.1 onwards, let McStas reside in /usr/share on Debian-like systems
 export MCINSTALL_PREFIX=/usr/share/
@@ -79,6 +79,7 @@ cd $WORK
 
 #build metapackages?
 if [ "x$2" != "x" ]; then
+ echo Building metapackage
  cd meta-pkgs/deb
 
  for controlfile in `ls control.mcstas*`
@@ -88,6 +89,11 @@ if [ "x$2" != "x" ]; then
  mv $controlfile.bak $controlfile
  done
 
- mv $WORK/meta-pkgs/deb/mcstas-suite*${1}*.deb $WORK/dist
- cp $WORK/INSTALL-McStas-3.x/Linux/debian/README.md $WORK/dist
+ echo DEB metapackages done
+
+ echo WORK dir is $WORK
+ echo mv ${WORK}/meta-pkgs/deb/mcstas-suite*${1}*.deb ${WORK}/dist
+ echo cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
+ mv ${WORK}/meta-pkgs/deb/mcstas-suite*${1}*.deb ${WORK}/dist
+ cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
 fi
diff --git a/buildscripts/build_debs_mcxtrace b/buildscripts/build_debs_mcxtrace
@@ -26,7 +26,7 @@ do
  fi
 done
 
-WORK=`pwd`
+export WORK=`pwd`
 
 # From 1.4 onwards, let McXtrace reside in /usr/share on Debian-like systems
 export MCINSTALL_PREFIX=/usr/share/
@@ -49,10 +49,22 @@ export MCINSTALL_PREFIX=/usr/share/
 ./mkdist mcxtrace-manuals $1 docpkg/manuals/mcxtrace/ "" deb64 "o" -- deb
 ./mkdist mcxtrace-tools-python-mxdoc $1 tools/Python/mcdoc/ "" deb64 "" -- deb
 
-./mkdist mcxtrace-mcpl $1 3rdparty/mcpl-package "" deb64 "" -- deb
+cd 3rdparty/mcpl
+rm -rf build
+mkdir build
+cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DMCPL_ENABLE_CPACK=ON
+make
+cpack -G DEB .
+DEB=`ls *.deb`
+DEBNAME=`echo $DEB | sed s/Linux/deb64/g`
+mv $DEB $WORK/dist/$DEBNAME
+
+cd $WORK
 
 #build metapackages?
 if [ "x$2" != "x" ]; then
+ echo Building metapackage
  cd meta-pkgs/deb
 
  for controlfile in `ls control.mcxtrace*`
@@ -62,6 +74,11 @@ if [ "x$2" != "x" ]; then
  mv $controlfile.bak $controlfile
  done
 
- mv $WORK/meta-pkgs/deb/mcxtrace-suite*${1}*.deb $WORK/dist
- cp $WORK/INSTALL-McXtrace/Linux/debian/README.md $WORK/dist
+ echo DEB metapackages done
+
+ echo WORK dir is $WORK
+ echo mv ${WORK}/meta-pkgs/deb/mcxtrace-suite*${1}*.deb ${WORK}/dist
+ echo cp ${WORK}/INSTALL-McXtrace-3.x/Linux/debian/README.md ${WORK}/dist
+ mv ${WORK}/meta-pkgs/deb/mcxtrace-suite*${1}*.deb ${WORK}/dist
+ cp ${WORK}/INSTALL-McXtrace-3.x/Linux/debian/README.md ${WORK}/dist
 fi
diff --git a/buildscripts/build_macos_mcstas_m1 b/buildscripts/build_macos_mcstas_m1
@@ -1,4 +1,4 @@
-# #!/usr/bin/env bash
+#!/usr/bin/env bash
 export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "import os;print(os.cpu_count())")}
 
 if [ "x$1" = "x" ]; then

diff --git a/buildscripts/build_macos_mcstas_m1_NEW b/buildscripts/build_macos_mcstas_m1_NEW
@@ -1,4 +1,4 @@
-# #!/usr/bin/env bash
+#!/usr/bin/env bash
 export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "import os;print(os.cpu_count())")}
 
 if [ "x$1" = "x" ]; then

diff --git a/environment.yml b/environment.yml
@@ -8,6 +8,8 @@ dependencies:
  - mamba
  - conda
  - cmake
+ - flex
+ - bison
  - compilers
  - openmpi
  - compilers

diff --git a/meta-pkgs/deb/control.mcxtrace-suite-perl-ng b/meta-pkgs/deb/control.mcxtrace-suite-perl-ng
diff --git a/meta-pkgs/deb/control.mcxtrace-suite-python-ng b/meta-pkgs/deb/control.mcxtrace-suite-python-ng
@@ -3,7 +3,7 @@ Version: @VERSION@
 Section: main
 Priority: optional
 Architecture: all
-Depends: mcxtrace-@VERSION@, mcxtrace-comps-@VERSION@, mcxtrace-tools-python-mxplot-pyqtgraph-@VERSION@, mcxtrace-tools-python-mxplot-matplotlib-@VERSION@, mcxtrace-tools-python-mxdisplay-pyqtgraph-@VERSION@, mcxtrace-tools-python-mxdisplay-webgl-@VERSION@, mcxtrace-tools-python-mxrun-@VERSION@, mcxtrace-tools-python-mxdoc-@VERSION@, mcxtrace-tools-perl-cmdline-@VERSION@, mcxtrace-tools-python-mccodelib-@VERSION@, mcxtrace-tools-python-mxgui-@VERSION@, mcxtrace-manuals-@VERSION@, mcxtrace-mcpl-@VERSION@
+Depends: mcxtrace-@VERSION@, mcxtrace-comps-@VERSION@, mcxtrace-tools-python-mxplot-pyqtgraph-@VERSION@, mcxtrace-tools-python-mxplot-matplotlib-@VERSION@, mcxtrace-tools-python-mxdisplay-pyqtgraph-@VERSION@, mcxtrace-tools-python-mxdisplay-webgl-@VERSION@, mcxtrace-tools-python-mxrun-@VERSION@, mcxtrace-tools-python-mxdoc-@VERSION@, mcxtrace-tools-perl-cmdline-@VERSION@, mcxtrace-tools-python-mccodelib-@VERSION@, mcxtrace-tools-python-mxgui-@VERSION@, mcxtrace-manuals-@VERSION@, mcpl
 Installed-Size:
 Maintainer: Erik B Knudsen <[email protected]>
 Description: A metapackage for McXtrace + python tools