Merge pull request #1669 from willend/main

Remove old buildscripts and logic to jump back and forth between main and mccode-legacy.
McStasMcXtrace · Aug 5, 2024 · 4330b5e · 4330b5e
2 parents 8187d8f + 58e706d
commit 4330b5e
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 195 deletions.
diff --git a/buildscripts/build_loc_2.x_mac b/buildscripts/build_loc_2.x_mac
diff --git a/buildscripts/build_loc_2.x_tree b/buildscripts/build_loc_2.x_tree
diff --git a/buildscripts/build_loc_3.x_ess b/buildscripts/build_loc_3.x_ess
@@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im
 # rapid-build script for mcstas-kernel dev:
 
 
-git checkout main
+
 git pull
 
 # Ensure our 3rd party modules are in place and updated

diff --git a/buildscripts/build_loc_3.x_mac b/buildscripts/build_loc_3.x_mac
@@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im
 # rapid-build script for mcstas-kernel dev:
 
 
-#git checkout main
+
 git pull
 
 # Ensure our 3rd party modules are in place and updated

diff --git a/buildscripts/build_loc_3.x_mac_conda b/buildscripts/build_loc_3.x_mac_conda
@@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im
 # rapid-build script for mcstas-kernel dev:
 
 
-#git checkout main
+
 #git pull
 
 # Ensure our 3rd party modules are in place and updated

diff --git a/buildscripts/build_loc_3.x_tree b/buildscripts/build_loc_3.x_tree
@@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im
 # rapid-build script for mcstas-kernel dev:
 
 
-git checkout main
+
 git pull
 
 # Ensure our 3rd party modules are in place and updated

diff --git a/buildscripts/build_loc_mcx_3x_mac.sh b/buildscripts/build_loc_mcx_3x_mac.sh
@@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im
 # rapid-build script for mcxtrace-kernel dev:
 
 
-git checkout main
+
 git pull
 
 # Ensure our 3rd party modules are in place and updated

diff --git a/buildscripts/build_pkg_ghostbsd b/buildscripts/build_pkg_ghostbsd
@@ -10,7 +10,7 @@ if [ "x$1" = "x" ]; then
     exit 1;
 fi
 
-git checkout main
+
 git pull
 
 # Ensure our 3rd party modules are in place and updated

diff --git a/buildscripts/xbuild_loc_1.x_tree b/buildscripts/xbuild_loc_1.x_tree
diff --git a/buildscripts/xbuild_loc_3.x_tree b/buildscripts/xbuild_loc_3.x_tree
@@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im
 # rapid-build script for mcstas-kernel dev:
 
 
-git checkout main
+
 git pull
 
 # Ensure our 3rd party modules are in place and updated