From 98c9fd5da4975f2b8665130aa2ad38b89724f4fb Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 10 May 2012 17:01:51 -0400 Subject: [PATCH] Move OSX GUI into subdirectory. Preparing to merge repos. --- .gitignore => osx-server-gui/.gitignore | 0 .../English.lproj}/Credits.html | 0 .../English.lproj}/InfoPlist.strings | 0 .../English.lproj}/MainMenu.xib | 0 Hop.icns => osx-server-gui/Hop.icns | Bin Makefile => osx-server-gui/Makefile | 2 +- fixup_shlibs.sh => osx-server-gui/fixup_shlibs.sh | 0 .../hopOsx-Info.plist | 0 .../hopOsx.xcodeproj}/project.pbxproj | 0 .../hopOsxAppDelegate.h | 0 .../hopOsxAppDelegate.m | 0 .../hopOsx_Prefix.pch | 0 {icon => osx-server-gui/icon}/Makefile | 0 {icon => osx-server-gui/icon}/icon.css | 0 {icon => osx-server-gui/icon}/icon.html | 0 {icon => osx-server-gui/icon}/icon.less | 0 main.m => osx-server-gui/main.m | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename .gitignore => osx-server-gui/.gitignore (100%) rename {English.lproj => osx-server-gui/English.lproj}/Credits.html (100%) rename {English.lproj => osx-server-gui/English.lproj}/InfoPlist.strings (100%) rename {English.lproj => osx-server-gui/English.lproj}/MainMenu.xib (100%) rename Hop.icns => osx-server-gui/Hop.icns (100%) rename Makefile => osx-server-gui/Makefile (98%) rename fixup_shlibs.sh => osx-server-gui/fixup_shlibs.sh (100%) rename hopOsx-Info.plist => osx-server-gui/hopOsx-Info.plist (100%) rename {hopOsx.xcodeproj => osx-server-gui/hopOsx.xcodeproj}/project.pbxproj (100%) rename hopOsxAppDelegate.h => osx-server-gui/hopOsxAppDelegate.h (100%) rename hopOsxAppDelegate.m => osx-server-gui/hopOsxAppDelegate.m (100%) rename hopOsx_Prefix.pch => osx-server-gui/hopOsx_Prefix.pch (100%) rename {icon => osx-server-gui/icon}/Makefile (100%) rename {icon => osx-server-gui/icon}/icon.css (100%) rename {icon => osx-server-gui/icon}/icon.html (100%) rename {icon => osx-server-gui/icon}/icon.less (100%) rename main.m => osx-server-gui/main.m (100%) diff --git a/.gitignore b/osx-server-gui/.gitignore similarity index 100% rename from .gitignore rename to osx-server-gui/.gitignore diff --git a/English.lproj/Credits.html b/osx-server-gui/English.lproj/Credits.html similarity index 100% rename from English.lproj/Credits.html rename to osx-server-gui/English.lproj/Credits.html diff --git a/English.lproj/InfoPlist.strings b/osx-server-gui/English.lproj/InfoPlist.strings similarity index 100% rename from English.lproj/InfoPlist.strings rename to osx-server-gui/English.lproj/InfoPlist.strings diff --git a/English.lproj/MainMenu.xib b/osx-server-gui/English.lproj/MainMenu.xib similarity index 100% rename from English.lproj/MainMenu.xib rename to osx-server-gui/English.lproj/MainMenu.xib diff --git a/Hop.icns b/osx-server-gui/Hop.icns similarity index 100% rename from Hop.icns rename to osx-server-gui/Hop.icns diff --git a/Makefile b/osx-server-gui/Makefile similarity index 98% rename from Makefile rename to osx-server-gui/Makefile index 6e9278b..c6b0e5d 100644 --- a/Makefile +++ b/osx-server-gui/Makefile @@ -1,4 +1,4 @@ -SERVER_PATH=../hop +SERVER_PATH=../server SERVER_BINARY=hop_server.native SERVER_WEB=web APP_NAME="Hop Server" diff --git a/fixup_shlibs.sh b/osx-server-gui/fixup_shlibs.sh similarity index 100% rename from fixup_shlibs.sh rename to osx-server-gui/fixup_shlibs.sh diff --git a/hopOsx-Info.plist b/osx-server-gui/hopOsx-Info.plist similarity index 100% rename from hopOsx-Info.plist rename to osx-server-gui/hopOsx-Info.plist diff --git a/hopOsx.xcodeproj/project.pbxproj b/osx-server-gui/hopOsx.xcodeproj/project.pbxproj similarity index 100% rename from hopOsx.xcodeproj/project.pbxproj rename to osx-server-gui/hopOsx.xcodeproj/project.pbxproj diff --git a/hopOsxAppDelegate.h b/osx-server-gui/hopOsxAppDelegate.h similarity index 100% rename from hopOsxAppDelegate.h rename to osx-server-gui/hopOsxAppDelegate.h diff --git a/hopOsxAppDelegate.m b/osx-server-gui/hopOsxAppDelegate.m similarity index 100% rename from hopOsxAppDelegate.m rename to osx-server-gui/hopOsxAppDelegate.m diff --git a/hopOsx_Prefix.pch b/osx-server-gui/hopOsx_Prefix.pch similarity index 100% rename from hopOsx_Prefix.pch rename to osx-server-gui/hopOsx_Prefix.pch diff --git a/icon/Makefile b/osx-server-gui/icon/Makefile similarity index 100% rename from icon/Makefile rename to osx-server-gui/icon/Makefile diff --git a/icon/icon.css b/osx-server-gui/icon/icon.css similarity index 100% rename from icon/icon.css rename to osx-server-gui/icon/icon.css diff --git a/icon/icon.html b/osx-server-gui/icon/icon.html similarity index 100% rename from icon/icon.html rename to osx-server-gui/icon/icon.html diff --git a/icon/icon.less b/osx-server-gui/icon/icon.less similarity index 100% rename from icon/icon.less rename to osx-server-gui/icon/icon.less diff --git a/main.m b/osx-server-gui/main.m similarity index 100% rename from main.m rename to osx-server-gui/main.m