From 4c4bffc86cde0ad76048a274d0b31022c32dc013 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Sat, 14 Feb 2015 10:21:49 -0500 Subject: [PATCH] Move osx directory from setup/data/osx to setup/apple. --- setup/{data/osx => apple}/.gitignore | 0 setup/{data/osx => apple}/Makefile | 2 +- .../NetRadiant.app/Contents/Info.plist | 0 .../NetRadiant.app/Contents/MacOS/radiant | 0 .../Contents/Resources/etc/fonts/fonts.conf | 0 .../Contents/Resources/etc/gtk-2.0/gtkrc | 0 .../Contents/Resources/etc/pango/pangorc | 0 .../Contents/Resources/lib/.turd | 0 .../Contents/Resources/radiant.icns | Bin .../Resources/share/gtk-2.0/icons/.turd | 0 .../Resources/share/gtk-2.0/themes/.turd | 0 setup/apple/README.md | 50 ++++++++++++++++++ setup/data/osx/README.md | 50 ------------------ 13 files changed, 51 insertions(+), 51 deletions(-) rename setup/{data/osx => apple}/.gitignore (100%) rename setup/{data/osx => apple}/Makefile (98%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Info.plist (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/MacOS/radiant (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/etc/pango/pangorc (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/lib/.turd (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/radiant.icns (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd (100%) rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd (100%) create mode 100644 setup/apple/README.md delete mode 100644 setup/data/osx/README.md diff --git a/setup/data/osx/.gitignore b/setup/apple/.gitignore similarity index 100% rename from setup/data/osx/.gitignore rename to setup/apple/.gitignore diff --git a/setup/data/osx/Makefile b/setup/apple/Makefile similarity index 98% rename from setup/data/osx/Makefile rename to setup/apple/Makefile index eb9ecadf..cf85d979 100644 --- a/setup/data/osx/Makefile +++ b/setup/apple/Makefile @@ -1,6 +1,6 @@ # Makefile for NetRadiant.app, requires http://macdylibbundler.sourceforge.net/ -INSTALL = ../../../install +INSTALL = ../../install TARGET = target RESOURCES = $(TARGET)/NetRadiant.app/Contents/Resources BINDIR = $(RESOURCES)/install diff --git a/setup/data/osx/NetRadiant.app/Contents/Info.plist b/setup/apple/NetRadiant.app/Contents/Info.plist similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Info.plist rename to setup/apple/NetRadiant.app/Contents/Info.plist diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/radiant b/setup/apple/NetRadiant.app/Contents/MacOS/radiant similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/MacOS/radiant rename to setup/apple/NetRadiant.app/Contents/MacOS/radiant diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf b/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf rename to setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc b/setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc rename to setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc b/setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc rename to setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/lib/.turd b/setup/apple/NetRadiant.app/Contents/Resources/lib/.turd similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Resources/lib/.turd rename to setup/apple/NetRadiant.app/Contents/Resources/lib/.turd diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/radiant.icns b/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Resources/radiant.icns rename to setup/apple/NetRadiant.app/Contents/Resources/radiant.icns diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd rename to setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd similarity index 100% rename from setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd rename to setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd diff --git a/setup/apple/README.md b/setup/apple/README.md new file mode 100644 index 00000000..069cf3db --- /dev/null +++ b/setup/apple/README.md @@ -0,0 +1,50 @@ +NetRadiant for Apple OS X +======================== + +This directory provides packaging steps for NetRadiant for OS X. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory. + +Dependencies & Compilation +-------------------------- + +Directions for OS X Yosemite 10.10 - your mileage may vary: + +- Install [MacPorts](http://macports.org). +- Install [XQuartz](http://xquartz.macosforge.org/) + +- Install dependencies with MacPorts: + +``` +sudo port install dylibbundler pkgconfig gtkglext +``` + +- Get the NetRadiant code and compile: + +``` +git clone https://gitlab.com/xonotic/netradiant.git +cd netradiant/ +make +``` + +- Run the build: + +(from the netradiant/ directory) +``` +./install/radiant +``` + +XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: `/Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin`, then start radiant. + +Building NetRadiant.app +----------------------- + +The `Makefile` in the 'setup/apple/' directory will produce a distributable .app bundle for NetRadiant using `dylibbundler`: + +``` +make +make image +``` + +Getting help +------------ + +IRC: Quakenet #xonotic, or post something on the issue tracker.. diff --git a/setup/data/osx/README.md b/setup/data/osx/README.md deleted file mode 100644 index 8122c170..00000000 --- a/setup/data/osx/README.md +++ /dev/null @@ -1,50 +0,0 @@ -GtkRadiant for Apple OSX -======================== - -This directory provides packaging steps for GtkRadiant for OSX. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory. - -Dependencies & Compilation --------------------------- - -Directions for OSX Mavericks 10.9 - your mileage may vary: - -- Install [MacPorts](http://macports.org). -- Install [XQuartz](http://xquartz.macosforge.org/) - -- Install dependencies with MacPorts: - -``` -sudo port install dylibbundler pkgconfig gtkglext scons -``` - -- Get the GtkRadiant code and compile: - -``` -git clone https://github.com/TTimo/GtkRadiant.git -cd GtkRadiant/ -scons -``` - -- Run the build: - -(from the GtkRadiant/ directory) -``` -./install/radiant.bin -``` - -XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: `/Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin`, then start radiant. - -Building GtkRadiant.app ------------------------ - -The `Makefile` in the 'apple/' directory will produce a distributable .app bundle for GtkRadiant using `dylibbundler`: - -``` -make -make image -``` - -Getting help ------------- - -Get on irc: Quakenet #radiant, or ask on the mailing list, or post something on the issue tracker.. -- 2.39.2