Merged in james-duley/librepilot/remove_OP_from_gcs_dir_structure (pull request #17)

Remove OP from GCS dir structure

Makefile

@@ -451,13 +451,7 @@ sim_osx_%: uavobjects_flight
 ##############################
 
 .PHONY: all_ground
-all_ground: openpilotgcs uploader
+all_ground: gcs uploader
-
-# Convenience target for the GCS
-.PHONY: gcs gcs_qmake gcs_clean
-gcs: openpilotgcs
-gcs_qmake: openpilotgcs_qmake
-gcs_clean: openpilotgcs_clean
 
 ifeq ($(V), 1)
     GCS_SILENT :=
@@ -465,29 +459,29 @@ else
     GCS_SILENT := silent
 endif
 
-OPENPILOTGCS_DIR := $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)
+GCS_DIR := $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)
-DIRS += $(OPENPILOTGCS_DIR)
+DIRS += $(GCS_DIR)
 
-OPENPILOTGCS_MAKEFILE := $(OPENPILOTGCS_DIR)/Makefile
+GCS_MAKEFILE := $(GCS_DIR)/Makefile
 
-.PHONY: openpilotgcs_qmake
+.PHONY: gcs_qmake
-openpilotgcs_qmake $(OPENPILOTGCS_MAKEFILE): | $(OPENPILOTGCS_DIR)
+gcs_qmake $(GCS_MAKEFILE): | $(GCS_DIR)
-	$(V1) cd $(OPENPILOTGCS_DIR) && \
+	$(V1) cd $(GCS_DIR) && \
-	    $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro \
+	    $(QMAKE) $(ROOT_DIR)/ground/gcs/gcs.pro \
 	    -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) \
 	    'GCS_BIG_NAME="$(GCS_BIG_NAME)"' GCS_SMALL_NAME=$(GCS_SMALL_NAME) \
 	    'ORG_BIG_NAME="$(ORG_BIG_NAME)"' ORG_SMALL_NAME=$(ORG_SMALL_NAME) \
 	    'GCS_LIBRARY_BASENAME=$(libbasename)' \
 	    $(GCS_QMAKE_OPTS)
 
-.PHONY: openpilotgcs
+.PHONY: gcs
-openpilotgcs: uavobjgenerator $(OPENPILOTGCS_MAKEFILE)
+gcs: uavobjgenerator $(GCS_MAKEFILE)
-	$(V1) $(MAKE) -w -C $(OPENPILOTGCS_DIR)/$(MAKE_DIR);
+	$(V1) $(MAKE) -w -C $(GCS_DIR)/$(MAKE_DIR);
 
-.PHONY: openpilotgcs_clean
+.PHONY: gcs_clean
-openpilotgcs_clean:
+gcs_clean:
-	@$(ECHO) " CLEAN      $(call toprel, $(OPENPILOTGCS_DIR))"
+	@$(ECHO) " CLEAN      $(call toprel, $(GCS_DIR))"
-	$(V1) [ ! -d "$(OPENPILOTGCS_DIR)" ] || $(RM) -r "$(OPENPILOTGCS_DIR)"
+	$(V1) [ ! -d "$(GCS_DIR)" ] || $(RM) -r "$(GCS_DIR)"
 
 
 
@@ -505,7 +499,7 @@ UPLOADER_MAKEFILE := $(UPLOADER_DIR)/Makefile
 .PHONY: uploader_qmake
 uploader_qmake $(UPLOADER_MAKEFILE): | $(UPLOADER_DIR)
 	$(V1) cd $(UPLOADER_DIR) && \
-	    $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/upload.pro \
+	    $(QMAKE) $(ROOT_DIR)/ground/gcs/src/experimental/USB_UPLOAD_TOOL/upload.pro \
 	    -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) $(GCS_QMAKE_OPTS)
 
 .PHONY: uploader
@@ -720,7 +714,7 @@ $(OPFW_RESOURCE): $(FW_TARGETS) | $(OPGCSSYNTHDIR)
 
 # If opfw_resource or all firmware are requested, GCS should depend on the resource
 ifneq ($(strip $(filter opfw_resource all all_fw all_flight package,$(MAKECMDGOALS))),)
-$(OPENPILOTGCS_MAKEFILE): $(OPFW_RESOURCE)
+$(GCS_MAKEFILE): $(OPFW_RESOURCE)
 endif
 
 # Packaging targets: package

ground/gcs/copydata.pro

@@ -1,4 +1,4 @@
-include(openpilotgcs.pri)
+include(gcs.pri)
 
 TEMPLATE = aux
 

ground/gcs/gcs.pro

@@ -24,7 +24,7 @@ macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 }
 
-include(openpilotgcs.pri)
+include(gcs.pri)
 
 TEMPLATE  = subdirs
 CONFIG   += ordered

ground/gcs/src/app/app.pro

@@ -1,4 +1,4 @@
-include(../../openpilotgcs.pri)
+include(../../gcs.pri)
 include(../shared/qtsingleapplication/qtsingleapplication.pri)
 
 TEMPLATE = app
@@ -23,12 +23,12 @@ LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation)
 DEFINES += PLUGIN_REL_PATH=$$shell_quote(\"$$relative_path($$GCS_PLUGIN_PATH, $$GCS_APP_PATH)\")
 
 win32 {
-    RC_FILE = librepilotgcs.rc
+    RC_FILE = gcs.rc
     target.path = /bin
     INSTALLS += target
 } else:macx {
     LIBS += -framework CoreFoundation
-    ICON = librepilotgcs.icns
+    ICON = gcs.icns
     QMAKE_INFO_PLIST = Info.plist
     FILETYPES.files = profile.icns prifile.icns
     FILETYPES.path = Contents/Resources
@@ -51,7 +51,7 @@ win32 {
     }
 }
 
-OTHER_FILES += librepilotgcs.rc
+OTHER_FILES += gcs.rc
 
 RESOURCES += \
     appresources.qrc

ground/gcs/src/app/gcs.rc

@@ -0,0 +1 @@
+ IDI_ICON1               ICON    DISCARDABLE     "gcs.ico"

ground/gcs/src/app/main.cpp

@@ -29,7 +29,7 @@
 
 /*
    The GCS application name is defined in the top level makefile - GCS_BIG_NAME / GCS_SMALL_NAME, and
-   set for the build in ../../openpilotgcs.pri and ./app.pro
+   set for the build in ../../gcs.pri and ./app.pro
 
    The GCS locale is set to the system locale by default unless the "hidden" setting General/Locale has a value.
    The user can not change General/Locale from the Options dialog.

ground/gcs/src/library.pri

@@ -1,4 +1,4 @@
-include(../openpilotgcs.pri)
+include(../gcs.pri)
 
 win32 {
     DLLDESTDIR = $$GCS_APP_PATH

ground/gcs/src/libs/aggregation/aggregation.pro

@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = Aggregation
 
-include(../../openpilotgcslibrary.pri)
+include(../../library.pri)
 
 DEFINES += AGGREGATION_LIBRARY