Browse Source

HUE-474. App Makefiles do not set APP_NAME correctly

In Makefile.sdk, I also decoupled the APP_NAME from the python distribution
name used by setuptools.
bc Wong 14 years ago
parent
commit
8ff68a32d0

+ 5 - 2
Makefile.sdk

@@ -48,13 +48,16 @@
 
 include $(ROOT)/Makefile.vars
 
+SETUPTOOLS_NAME := $(shell python setup.py --name)
+
 APP_ROOT := $(realpath .)
-APP_NAME ?= $(notdir $(APP_ROOT))
+APP_NAME ?= $(SETUPTOOLS_NAME)
 APP_VERSION ?= $(shell python setup.py --version)
 APP_FULL_NAME ?= $(APP_NAME)-$(APP_VERSION)
 
+
 BUILD_DIR := $(APP_ROOT)/build
-EGG_INFO_DIR := $(APP_ROOT)/src/$(APP_NAME).egg-info
+EGG_INFO_DIR := $(APP_ROOT)/src/$(SETUPTOOLS_NAME).egg-info
 
 .PHONY: default
 default::

+ 1 - 1
apps/about/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-about-$(APP_VERSION)
+APP_NAME = hue-about
 include $(ROOT)/Makefile.sdk

+ 1 - 1
apps/beeswax/Makefile

@@ -20,7 +20,7 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-beeswax-$(APP_VERSION)
+APP_NAME = hue-beeswax
 include $(ROOT)/Makefile.sdk
 
 ###################################

+ 1 - 1
apps/filebrowser/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-filebrowser-$(APP_VERSION)
+APP_NAME = hue-filebrowser
 include $(ROOT)/Makefile.sdk

+ 1 - 1
apps/hello/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-hello-$(APP_VERSION)
+APP_NAME = hue-hello
 include $(ROOT)/Makefile.sdk

+ 1 - 1
apps/help/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-help-$(APP_VERSION)
+APP_NAME = hue-help
 include $(ROOT)/Makefile.sdk

+ 1 - 1
apps/jframegallery/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-jframegallery-$(APP_VERSION)
+APP_NAME = hue-jframegallery
 include $(ROOT)/Makefile.sdk

+ 1 - 1
apps/jobbrowser/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-jobbrowser-$(APP_VERSION)
+APP_NAME = hue-jobbrowser
 include $(ROOT)/Makefile.sdk

+ 1 - 1
apps/jobsub/Makefile

@@ -20,7 +20,7 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-jobsub-$(APP_VERSION)
+APP_NAME = hue-jobsub
 include $(ROOT)/Makefile.sdk
 
 #############################

+ 1 - 1
apps/proxy/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-proxy-$(APP_VERSION)
+APP_NAME = hue-proxy
 include $(ROOT)/Makefile.sdk

+ 1 - 1
apps/useradmin/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_FULL_NAME = hue-useradmin-$(APP_VERSION)
+APP_NAME = hue-useradmin
 include $(ROOT)/Makefile.sdk