Merge pull request #1659 from willend/main

Follow-up to #1658
McStasMcXtrace · Jul 31, 2024 · 810f1f6 · 810f1f6
2 parents 16d779e + d1fb577
commit 810f1f6
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/buildscripts/build_debs_mcstas b/buildscripts/build_debs_mcstas
@@ -101,7 +101,7 @@ if [ "x$2" != "x" ]; then
 
   echo WORK dir is $WORK
   echo mv ${WORK}/meta-pkgs/deb/$FLAVOUR-suite*${1}*.deb ${WORK}/dist
-  echo cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
+  echo cp ${WORK}/INSTALL-McStas/Linux/debian/README.md ${WORK}/dist
   mv ${WORK}/meta-pkgs/deb/$FLAVOUR-suite*${1}*.deb ${WORK}/dist
-  cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
+  cp ${WORK}/INSTALL-McStas/Linux/debian/README.md ${WORK}/dist
 fi
diff --git a/buildscripts/build_debs_mcstas32 b/buildscripts/build_debs_mcstas32
@@ -101,7 +101,7 @@ if [ "x$2" != "x" ]; then
 
   echo WORK dir is $WORK
   echo mv ${WORK}/meta-pkgs/deb/$FLAVOUR-suite*${1}*.deb ${WORK}/dist
-  echo cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
+  echo cp ${WORK}/INSTALL-McStas/Linux/debian/README.md ${WORK}/dist
   mv ${WORK}/meta-pkgs/deb/$FLAVOUR-suite*${1}*.deb ${WORK}/dist
-  cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
+  cp ${WORK}/INSTALL-McStas/Linux/debian/README.md ${WORK}/dist
 fi
diff --git a/buildscripts/build_debs_mcstas_arm64 b/buildscripts/build_debs_mcstas_arm64
@@ -101,7 +101,7 @@ if [ "x$2" != "x" ]; then
 
   echo WORK dir is $WORK
   echo mv ${WORK}/meta-pkgs/deb/$FLAVOUR-suite*${1}*.deb ${WORK}/dist
-  echo cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
+  echo cp ${WORK}/INSTALL-McStas/Linux/debian/README.md ${WORK}/dist
   mv ${WORK}/meta-pkgs/deb/$FLAVOUR-suite*${1}*.deb ${WORK}/dist
-  cp ${WORK}/INSTALL-McStas-3.x/Linux/debian/README.md ${WORK}/dist
+  cp ${WORK}/INSTALL-McStas/Linux/debian/README.md ${WORK}/dist
 fi
diff --git a/buildscripts/build_macos_mcstas b/buildscripts/build_macos_mcstas
@@ -88,7 +88,7 @@ if [ "x$2" = "x" ]; then
     mv dist mcstas-${MCVERSION}
     mkdir dist
     tar cfz dist/mcstas-${MCVERSION}_x86_64.tgz mcstas-${MCVERSION}
-    cp INSTALL-McStas-3.x/macOS/README.md dist
+    cp INSTALL-McStas/macOS/README.md dist
     echo A tgz of your app is now located in the dist folder
     rm -rf mcstas-${MCVERSION}
 else

diff --git a/buildscripts/build_macos_mcstas_m1 b/buildscripts/build_macos_mcstas_m1
@@ -88,7 +88,7 @@ if [ "x$2" = "x" ]; then
     mv dist mcstas-${MCVERSION}
     mkdir dist
     tar cfz dist/mcstas-${MCVERSION}_arm64.tgz mcstas-${MCVERSION}
-    cp INSTALL-McStas-3.x/macOS/README.md dist
+    cp INSTALL-McStas/macOS/README.md dist
     echo A tgz of your app is now located in the dist folder
     rm -rf mcstas-${MCVERSION}
 else

diff --git a/buildscripts/build_macos_mcstas_m1_NEW b/buildscripts/build_macos_mcstas_m1_NEW
@@ -84,7 +84,7 @@ if [ "x$2" = "x" ]; then
     mv dist mcstas-${MCVERSION}
     mkdir dist
     tar cfz dist/mcstas-${MCVERSION}_arm64.tgz mcstas-${MCVERSION}
-    cp INSTALL-McStas-3.x/macOS/README.md dist
+    cp INSTALL-McStas/macOS/README.md dist
     echo A tgz of your app is now located in the dist folder
     rm -rf mcstas-${MCVERSION}
 else

diff --git a/buildscripts/build_rpms_centos7_mcstas b/buildscripts/build_rpms_centos7_mcstas
@@ -85,5 +85,5 @@ if [ "x$2" != "x" ]; then
     mv $controlfile.bak $controlfile
   done
   mv $HOME/rpmbuild/RPMS/x86_64/mcstas-suite-*rpm $WORK/dist
-  cp $WORK/INSTALL-McStas-3.x/Linux/centos/README.md $WORK/dist
+  cp $WORK/INSTALL-McStas/Linux/centos/README.md $WORK/dist
 fi
diff --git a/buildscripts/build_rpms_fedora_mcstas b/buildscripts/build_rpms_fedora_mcstas
@@ -85,5 +85,5 @@ if [ "x$2" != "x" ]; then
     mv $controlfile.bak $controlfile
   done
   mv $HOME/rpmbuild/RPMS/x86_64/mcstas-suite-*rpm $WORK/dist
-  cp $WORK/INSTALL-McStas-3.x/Linux/fedora/README.md $WORK/dist
+  cp $WORK/INSTALL-McStas/Linux/fedora/README.md $WORK/dist
 fi
diff --git a/buildscripts/build_rpms_scientific_linux_mcstas b/buildscripts/build_rpms_scientific_linux_mcstas
@@ -61,5 +61,5 @@ if [ "x$2" != "x" ]; then
     mv $controlfile.bak $controlfile
   done
   mv $HOME/rpmbuild/RPMS/x86_64/mcstas-suite-*rpm $WORK/dist
-  cp $WORK/INSTALL-McStas-3.x/Linux/centos/README.md $WORK/dist
+  cp $WORK/INSTALL-McStas/Linux/centos/README.md $WORK/dist
 fi
diff --git a/buildscripts/build_src_mcstas b/buildscripts/build_src_mcstas
@@ -73,5 +73,5 @@ if [ "x$2" != "x" ]; then
   tar -tf $outfile
   gzip $outfile
   rm mcstas-${1}-UNIX-src
-  cp $WORK/INSTALL-McStas-3.x/Linux/src/README.md $WORK/dist
+  cp $WORK/INSTALL-McStas/Linux/src/README.md $WORK/dist
 fi
diff --git a/buildscripts/build_windows_mcstas b/buildscripts/build_windows_mcstas
@@ -79,7 +79,7 @@ if [ "x$2" != "x" ]; then
     sed s/@VERSION@/${1}/g McStas-metapackage64.iss > McStas-${1}-metapackage64.iss
     ./iscc McStas-${1}-metapackage64.iss
     mv Output/setup.exe dist/McStas-Metapackage-${1}-win64.exe
-    cp $WORK/INSTALL-McStas-3.x/Windows/README.md dist/
+    cp $WORK/INSTALL-McStas/Windows/README.md dist/
     mkdir dist/single-packages
     mv dist/mcstas-* dist/single-packages
 fi
diff --git a/buildscripts/build_windows_mcstas_NEW b/buildscripts/build_windows_mcstas_NEW
@@ -79,7 +79,7 @@ if [ "x$2" != "x" ]; then
     mv Output/setup.exe dist/McStas-Metapackage-${1}-win64.exe
     mkdir dist/extras
     cp NeXus/*.* dist/extras
-    cp $WORK/INSTALL-McStas-3.x/Windows/README.md dist/
+    cp $WORK/INSTALL-McStas/Windows/README.md dist/
     mkdir dist/single-packages
     mv dist/mcstas-* dist/single-packages
 fi