Skip to content

Commit

Permalink
Allow to only build the manual ONCE pr. release (put pdf's in docpkg/…
Browse files Browse the repository at this point in the history
…manuals/mcstas/ prior to packaging the dist packages)
  • Loading branch information
willend committed Mar 17, 2016
1 parent 6c8e5ec commit f598082
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build_arm_debs_mcstas
Expand Up @@ -22,4 +22,4 @@ export MCINSTALL_PREFIX=/usr/share/
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" armlinux32 "" -- deb
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" armlinux32 "" -- deb
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" armlinux32 "" -- deb
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" armlinux32 "o" -- deb
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" armlinux32 "o" -- deb
4 changes: 2 additions & 2 deletions build_debs_mcstas
Expand Up @@ -24,7 +24,7 @@ export MCINSTALL_PREFIX=/usr/share/
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" linux64 "" -- deb
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" linux64 "" -- deb
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" linux64 "" -- deb
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" linux64 "o" -- deb
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" linux64 "o" -- deb

# 32-bit
./mkdist mcstas $1 "" "" linux32 "" -- deb
Expand All @@ -41,4 +41,4 @@ export MCINSTALL_PREFIX=/usr/share/
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" linux32 "" -- deb
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" linux32 "" -- deb
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" linux32 "" -- deb
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" linux32 "o" -- deb
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" linux32 "o" -- deb
2 changes: 1 addition & 1 deletion build_macos_El_Capitan_mcstas
Expand Up @@ -27,7 +27,7 @@ fi
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" mac_el_capitan "" -- OSXpkg
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" mac_el_capitan "" -- OSXpkg
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" mac_el_capitan "" -- OSXpkg
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" mac_el_capitan "o" -- OSXpkg
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" mac_el_capitan "o" -- OSXpkg

if [ "x$2" != "x" ]; then
# If this is a meta-package being built, we should aim for installation in /opt/mccode
Expand Down
2 changes: 1 addition & 1 deletion build_macos_Maverics_mcstas
Expand Up @@ -27,7 +27,7 @@ fi
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" mac "" -- OSXpkg
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" mac "" -- OSXpkg
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" mac "" -- OSXpkg
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" mac "o" -- OSXpkg
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" mac "o" -- OSXpkg

if [ "x$2" != "x" ]; then
# If this is a meta-package being built, we should aim for installation in /opt/mccode
Expand Down
2 changes: 1 addition & 1 deletion build_macos_Yosemite_mcstas
Expand Up @@ -27,7 +27,7 @@ fi
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" mac_yosemite "" -- OSXpkg
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" mac_yosemite "" -- OSXpkg
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" mac_yosemite "" -- OSXpkg
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" mac_yosemite "o" -- OSXpkg
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" mac_yosemite "o" -- OSXpkg

if [ "x$2" != "x" ]; then
# If this is a meta-package being built, we should aim for installation in /opt/mccode
Expand Down
4 changes: 2 additions & 2 deletions build_rpms_mcstas
Expand Up @@ -20,7 +20,7 @@ fi
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" linux64 "" -- rpm
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" linux64 "" -- rpm
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" linux64 "" -- rpm
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" linux64 "o" -- rpm
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" linux64 "o" -- rpm

# 32-bit
./mkdist mcstas $1 "" "" linux32 "" -- rpm
Expand All @@ -36,4 +36,4 @@ fi
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" linux32 "" -- rpm
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" linux32 "" -- rpm
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" linux32 "" -- rpm
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" linux32 "o" -- rpm
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" linux32 "o" -- rpm
4 changes: 2 additions & 2 deletions build_src_bin_mcstas
Expand Up @@ -19,7 +19,7 @@ fi
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" linux64 "" -- src bin
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" linux64 "" -- src bin
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" linux64 "" -- src bin
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" linux64 "o" -- src bin
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" linux64 "o" -- src bin

# 32-bit
./mkdist mcstas $1 "" "" linux32 "" -- src bin
Expand All @@ -34,4 +34,4 @@ fi
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" linux32 "" -- src bin
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" linux32 "" -- src bin
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" linux32 "" -- src bin
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" linux32 "o" -- src bin
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" linux32 "o" -- src bin
2 changes: 1 addition & 1 deletion build_windows_mcstas
Expand Up @@ -28,7 +28,7 @@ find tools/Legacy-Perl-win -type f -exec todos \{\} \;
./mkdist mcstas-tools-python-mcdisplay-r $1 tools/Python/mcdisplay/R/ "" mingw32 "" -- nsis
./mkdist mcstas-tools-python-mcdisplay-matplotlib $1 tools/Python/mcdisplay/matplotlib/ "" mingw32 "" -- nsis
./mkdist mcstas-tools-python-mcdisplay-vtk $1 tools/Python/mcdisplay/VTK/ "" mingw32 "" -- nsis
./mkdist mcstas-manuals $1 doc/manuals/mcstas/ "" mingw32 "o" -- nsis
./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" mingw32 "o" -- nsis

if [ "x$2" != "x" ]; then
# Build the meta-packages also
Expand Down
Binary file added docpkg/manuals/mcstas/Component_manual.pdf
Binary file not shown.
1 change: 1 addition & 0 deletions docpkg/manuals/mcstas/cmake
Binary file added docpkg/manuals/mcstas/manual.pdf
Binary file not shown.

0 comments on commit f598082

Please sign in to comment.