summaryrefslogtreecommitdiff
path: root/distribution/osx
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-19 19:56:15 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-19 19:56:15 +0100
commit1542c122b3672fe83e027411ad2445772e2d0ed3 (patch)
treee535bc621bd7ffa9d5ce89e0d495df5d1c4ab6fd /distribution/osx
parent773810e6583142d7d15263e6481c42aebed6d7f1 (diff)
parentd1a8285f818eb7e5c3d6a05709ea21a808490b8c (diff)
Update upstream source from tag 'upstream/5.1.0'
Update to upstream version '5.1.0' with Debian dir 93ca74b8b4602fce4c9c7740e0cfdde25f086673
Diffstat (limited to 'distribution/osx')
-rw-r--r--distribution/osx/gtk-bundle/CMakeLists.txt2
-rw-r--r--distribution/osx/gtk-bundle/gtk-bundle.README21
2 files changed, 9 insertions, 14 deletions
diff --git a/distribution/osx/gtk-bundle/CMakeLists.txt b/distribution/osx/gtk-bundle/CMakeLists.txt
index 4aa1150..f93ad9c 100644
--- a/distribution/osx/gtk-bundle/CMakeLists.txt
+++ b/distribution/osx/gtk-bundle/CMakeLists.txt
@@ -11,7 +11,7 @@ DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR}/XTrackCAD.help
)
INSTALL (
FILES ${CMAKE_CURRENT_SOURCE_DIR}/toc.js
-DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR}/XTrackCAD.help/Contents/Resources/en.lproj
+DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR}/XTrackCAD.help/Contents/Resources/en.lproj/scrpt
)
ADD_SUBDIRECTORY(XTrackCAD-help)
diff --git a/distribution/osx/gtk-bundle/gtk-bundle.README b/distribution/osx/gtk-bundle/gtk-bundle.README
index 139cec7..0c7c9ea 100644
--- a/distribution/osx/gtk-bundle/gtk-bundle.README
+++ b/distribution/osx/gtk-bundle/gtk-bundle.README
@@ -1,7 +1,7 @@
Readme for gtk-bundle directory.
Created 12-1-2016 by Adam Richards
-Date: Dec-2016.
+Date: Nov-2017.
The gtk-bundle technique replaces prior bundle techniques for OSX.
@@ -13,30 +13,25 @@ The bundler also requires a prior Macports install of GTK
"sudo port install webkit-gtk"
and that was the GTK level was used to build the xtrkcad binary.
-The ccmake process will place a copy of the binary in the /bin build subdirectory
+The ccmake install process will place a copy of the binary in the /bin install subdirectory
for use by G-M-B. It also copies over the resource share libraries into a subdirectory.
Process:
-Once ccmake has been run "make" followed by "make install", the G-M-B tool is run
-pointing at the xtrkcad.bundle file.
+Once ccmake has been run "make" followed by "make install", the G-M-B tool is run.
"cd /gtk-bundle"
-"gtk-mac-bundler xtrkcad-bundle"
+"bash xtrkcad-bundler.sh -i <install directory containing xtrkcad binary> -v <version name>"
Output:
-G-M-B produces an .app bundle that is a self-contained executable
-from the binary xtrkcad in gtk-bundle/bin. It recursively rewires all the link pointers to be
+G-M-B produces a dmg bundle and zips it in the binary directory that is a self-contained executable
+from the binary xtrkcad. It recursively rewires all the link pointers to be
self-referential - that is, to point within the bundle.
It uses the xtrkcad.plist to set properties of the app, including the
icon from the .icns file. It sets the pre-run script to be xtrkcad-launcher.sh
Next Steps:
-Once this xtrkcad.app file has been created, it can be moved to wherever is desirable
-- such as the Application folder. The app does not have dependencies on GTK components
-from MACPorts like the binary does - it is standalone.
-
-To produce an installable image from the .app, the disk utility can be used to create
-a RW image .dmg that the .app can be copied into.
+Once this xtrkcad.dmg file has been created, it can be opened and the included package can be moved to wherever is desirable - such as the Application folder. The app does not have dependencies on GTK components
+from MACPorts like the binary does - it is standalone. It does, however, need XQuartz.
NOTE -
It is expected that as long as the GTK level used in build can run on the OSX level used