Reworked OSX bundle test to allow adding Linux in the future.

11 files changed, 48 insertions, 22 deletions

diff --git a/manual tests/3 osx bundle/meson.build b/manual tests/3 osx bundle/meson.build
deleted file mode 100644
index 13ab29a..0000000
--- a/manual tests/3 osx bundle/meson.build
+++ /dev/null
@@ -1,18 +0,0 @@
-project('myapp', 'c')
-
-sdl = dependency('sdl2')
-
-prog = executable('myapp', 'myapp.c',
-dependencies : sdl,
-install : true)
-
-install_data('myapp.sh',
-install_dir : 'Contents/MacOS')
-
-install_data('myapp.icns',
-install_dir : 'Contents/Resources')
-
-install_data('Info.plist',
-install_dir : 'Contents')
-
-meson.set_install_script('install_script.sh')
diff --git a/manual tests/3 osx bundle/myapp.sh b/manual tests/3 osx bundle/myapp.sh
deleted file mode 100755
index 2303818..0000000
--- a/manual tests/3 osx bundle/myapp.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd "${0%/*}"
-./myapp
diff --git a/manual tests/3 osx bundle/Info.plist b/manual tests/3 standalone binaries/Info.plist
index 0f0c90e..0f0c90e 100644
--- a/manual tests/3 osx bundle/Info.plist
+++ b/manual tests/3 standalone binaries/Info.plist
diff --git a/manual tests/3 osx bundle/build_osx_installer.sh b/manual tests/3 standalone binaries/build_osx_installer.sh
index 9225415..9225415 100755
--- a/manual tests/3 osx bundle/build_osx_installer.sh
+++ b/manual tests/3 standalone binaries/build_osx_installer.sh
diff --git a/manual tests/3 standalone binaries/meson.build b/manual tests/3 standalone binaries/meson.build
new file mode 100644
index 0000000..8af9fa1
--- /dev/null
+++ b/manual tests/3 standalone binaries/meson.build
@@ -0,0 +1,26 @@
+project('myapp', 'c')
+
+sdl = dependency('sdl2')
+
+if host.name() == 'darwin'
+  install_data('myapp.sh',
+  install_dir : 'Contents/MacOS')
+
+  install_data('myapp.icns',
+  install_dir : 'Contents/Resources')
+
+  install_data('Info.plist',
+  install_dir : 'Contents')
+
+  meson.set_install_script('osx_bundler.sh')
+endif
+
+if host.name() == 'linux'
+  install_data('myapp.sh', install_dir : '.')
+  meson.set_install_script('linux_bundler.sh')
+endif
+
+
+prog = executable('myapp', 'myapp.c',
+dependencies : sdl,
+install : true)
diff --git a/manual tests/3 osx bundle/myapp.c b/manual tests/3 standalone binaries/myapp.c
index 83a4e4c..83a4e4c 100644
--- a/manual tests/3 osx bundle/myapp.c
+++ b/manual tests/3 standalone binaries/myapp.c
diff --git a/manual tests/3 osx bundle/myapp.icns b/manual tests/3 standalone binaries/myapp.icns
index 6331954..6331954 100644
--- a/manual tests/3 osx bundle/myapp.icns
+++ b/manual tests/3 standalone binaries/myapp.icns
diff --git a/manual tests/3 standalone binaries/myapp.sh b/manual tests/3 standalone binaries/myapp.sh
new file mode 100755
index 0000000..3191483
--- /dev/null
+++ b/manual tests/3 standalone binaries/myapp.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd "${0%/*}"
+
+if [ `uname` == 'Darwin' ]; then
+    ./myapp
+else
+    export LD_LIBRARY_PATH="`pwd`/lib"
+    bin/myapp
+fi
diff --git a/manual tests/3 osx bundle/install_script.sh b/manual tests/3 standalone binaries/osx_bundler.sh
index f61187f..f61187f 100755
--- a/manual tests/3 osx bundle/install_script.sh
+++ b/manual tests/3 standalone binaries/osx_bundler.sh
diff --git a/manual tests/3 standalone binaries/readme.txt b/manual tests/3 standalone binaries/readme.txt
new file mode 100644
index 0000000..6b26c49
--- /dev/null
+++ b/manual tests/3 standalone binaries/readme.txt
@@ -0,0 +1,12 @@
+This directory shows how you can build redistributable binaries. On
+OSX this menans building an app bundle and a .dmg installer. On Linux
+it means building a binary that bundles its dependencies. On Windows
+it means probably building an .exe installer or something (not done
+yet).
+
+To build each package you run the corresponding build_ARCH.sh build script.
+
+On Linux you must build the package on the oldest distribution you
+plan to support (Debian stable/oldstable and old CentOS are usually
+the choice here).
+
diff --git a/manual tests/3 osx bundle/template.dmg.gz b/manual tests/3 standalone binaries/template.dmg.gz
index fcb6d61..fcb6d61 100644
--- a/manual tests/3 osx bundle/template.dmg.gz
+++ b/manual tests/3 standalone binaries/template.dmg.gz