Skip to site navigation (Press enter)

[commits] (bear) [11349] Changes required to allow the Plugin eggs to be installed with specified install and script dirs

commits Mon, 07 Aug 2006 18:47:34 -0700

Title: [commits] (bear) [11349] Changes required to allow the Plugin eggs to be installed with specified install and script dirs

Revision: 11349
Author: bear
Date: 2006-08-07 18:47:31 -0700 (Mon, 07 Aug 2006)

Log Message

Changes required to allow the Plugin eggs to be installed with specified install and script dirs
on windows, linux and os x
bug 6438 and the start of bug 6434

Modified Paths

trunk/chandler/Makefile

Diff

Modified: trunk/chandler/Makefile (11348 => 11349)

--- trunk/chandler/Makefile	2006-08-08 01:04:10 UTC (rev 11348)
+++ trunk/chandler/Makefile	2006-08-08 01:47:31 UTC (rev 11349)
@@ -28,6 +28,20 @@
 # this is because of RunChandler.bat and RunPython.bat
 # so internally we need to convert them to unix style
 
+ifeq ($(CHANDLERHOME),)
+CHANDLERHOME=$(shell pwd)
+endif
+
+ifeq ($(CHANDLERBIN),)
+CHANDLERBIN=$(CHANDLERHOME)
+endif
+
+ifeq ($(CHANDLERARCHIVES),)
+CHANDLERARCHIVES=../downloads
+endif
+
+PLUGIN_ARCHIVES=$(CHANDLERARCHIVES)
+
 ifeq ($(OS),Cygwin)
 C_BIN=$(shell cygpath -aw $(CHANDLERBIN))
 C_HOME=$(shell cygpath -aw $(CHANDLERHOME))
@@ -51,18 +65,6 @@
 endif
 endif
 
-ifeq ($(CHANDLERHOME),)
-CHANDLERHOME=$(shell pwd)
-endif
-
-ifeq ($(CHANDLERBIN),)
-CHANDLERBIN=$(CHANDLERHOME)
-endif               
-
-ifeq ($(CHANDLERARCHIVES),)
-CHANDLERARCHIVES=../downloads
-endif
-
 BUNDLED_PLUGINS=Chandler_HelloWorldPlugin-0.1-py2.4.egg \
                 Chandler_FeedsPlugin-0.2_r11264-py2.4.egg
 #                Chandler_FeedsPlugin-0.2_r11338-py2.4.egg
@@ -118,18 +120,15 @@
 ifeq ($(OS),Darwin)
 EASYINSTALL=MACOSX_DEPLOYMENT_TARGET= $(PYTHON_BIN) $(C_BIN)/$(SNAP)/easy_install
 PLUGIN_PYTHON=MACOSX_DEPLOYMENT_TARGET= CHANDLERHOME=$(C_HOME) $(C_BIN)/$(SNAP)/RunPython
-PLUGIN_ARCHIVES=$(CHANDLERARCHIVES)/
 SED_MODERN=-E
 else
 ifeq ($(OS),Cygwin)
-EASYINSTALL=$(C_BIN)/$(SNAP)/easy_install
+EASYINSTALL=$(CHANDLERBIN)/$(SNAP)/easy_install.exe
 PLUGIN_PYTHON=CHANDLERHOME=$(shell cygpath -aw $(C_HOME)) $(CHANDLERBIN)/$(SNAP)/bin/python$(DEBUG_SUFFIX)
-PLUGIN_ARCHIVES=$(shell cygpath -aw $(CHANDLERARCHIVES))\\
 SED_MODERN=-r
 else
 EASYINSTALL=$(C_BIN)/$(SNAP)/easy_install
 PLUGIN_PYTHON=CHANDLERHOME=$(C_HOME) $(C_BIN)/$(SNAP)/RunPython
-PLUGIN_ARCHIVES=$(CHANDLERARCHIVES)/
 SED_MODERN=-r
 endif
 endif
@@ -137,6 +136,23 @@
 HOST=builds.osafoundation.org
 URL=""
 
+SETUPTOOLS_EGG=$(CHANDLERARCHIVES)/setuptools-0.6b3-py2.4.egg
+SETUPTOOLS_ABS=$(SETUPTOOLS_EGG)
+SETUPTOOLS_BIN=$(CHANDLERBIN)/$(SNAP)
+SETUPTOOLS_SITE=$(CHANDLERBIN)/$(SITE)
+EASYINSTALL_BIN=$(EASYINSTALL)
+PLUGIN_ABS=$(PLUGIN_ARCHIVES)
+PYTHON_BIN=$(CHANDLERBIN)/$(SNAP)/RunPython
+
+ifeq ($(OS),Cygwin)
+PYTHON_BIN:=$(SETUPTOOLS_BIN)/bin/python$(DEBUG_SUFFIX)
+SETUPTOOLS_ABS:=`cygpath -wa $(SETUPTOOLS_EGG)`
+SETUPTOOLS_BIN:=`cygpath -wa $(SETUPTOOLS_BIN)`
+SETUPTOOLS_SITE:=`cygpath -wa $(SETUPTOOLS_SITE)`
+EASYINSTALL_BIN:=`cygpath -wa $(EASYINSTALL)`
+PLUGIN_ABS:=`cygpath -aw $(PLUGIN_ARCHIVES)`
+endif
+
 ARCHIVES_INST = \
     $(addsuffix .inst, \
                 $(addprefix $(C_BIN)/$(SNAP)/, \
@@ -148,7 +164,7 @@
                             $(notdir $(BUNDLED_PLUGINS))))
 
 PLUGINS_DOWNLOAD = \
-                $(addprefix $(PLUGIN_ARCHIVES), \
+                $(addprefix $(PLUGIN_ARCHIVES)/, \
                             $(notdir $(BUNDLED_PLUGINS)))
 
 .PHONY: default install clean realclean downloads build-plugins
@@ -158,13 +174,14 @@
 downloads: $(ARCHIVES) $(PLUGINS_DOWNLOAD)
 
 $(PLUGINS_DOWNLOAD):
-	$(CURL) $(PLUGIN_ARCHIVES)$(notdir $@) $(URL)/$(notdir $@)
+	$(CURL) $(PLUGIN_ARCHIVES)/$(notdir $@) $(URL)/$(notdir $@)
 
 $(PLUGINS_INST):
-	$(EASYINSTALL) \
+	MACOSX_DEPLOYMENT_TARGET= $(PYTHON_BIN) \
+      -c "import sys; sys.path.insert(0,r'$(SETUPTOOLS_ABS)'); from setuptools.command.easy_install import main; main()" \
       --script-dir=$(SETUPTOOLS_BIN) \
       --install-dir=$(SETUPTOOLS_SITE) \
-      $(PLUGIN_ARCHIVES)$(notdir $(basename $@))
+      $(PLUGIN_ABS)/$(notdir $(basename $@))
 	touch $@
 
 bundled-plugins: $(PLUGINS_DOWNLOAD) $(PLUGINS_INST)
@@ -183,23 +200,11 @@
 	tar -C $(CHANDLERBIN) -xvzf $(CHANDLERARCHIVES)/$(notdir $(basename $@))
 	touch $@
 
-SETUPTOOLS_EGG=$(CHANDLERARCHIVES)/setuptools-0.6b3-py2.4.egg
 SETUPTOOLS_INST = \
     $(addsuffix .inst, \
                 $(addprefix $(CHANDLERBIN)/$(SNAP)/, \
                             $(notdir $(SETUPTOOLS_EGG))))
-SETUPTOOLS_ABS=$(SETUPTOOLS_EGG)
-SETUPTOOLS_BIN=$(CHANDLERBIN)/$(SNAP)
-SETUPTOOLS_SITE=$(CHANDLERBIN)/$(SITE)
-PYTHON_BIN=$(CHANDLERBIN)/$(SNAP)/RunPython
 
-ifeq ($(OS),Cygwin)
-PYTHON_BIN:=$(SETUPTOOLS_BIN)/bin/python$(DEBUG_SUFFIX)
-SETUPTOOLS_ABS:=`cygpath -wa $(SETUPTOOLS_EGG)`
-SETUPTOOLS_BIN:=`cygpath -wa $(SETUPTOOLS_BIN)`
-SETUPTOOLS_SITE:=`cygpath -wa $(SETUPTOOLS_SITE)`
-endif
-
 setuptools: $(SETUPTOOLS_INST)
 
 $(SETUPTOOLS_EGG):
@@ -238,7 +243,7 @@
 # to install individual eggs, for example: make Chandler_HelloWorldPlugin
 
 $(notdir $(shell echo $(BUNDLED_PLUGINS) | sed $(SED_MODERN) "s/-[0-9]+[^ ]*\.egg//g")):
-	$(MAKE) $(PLUGIN_ARCHIVES)$(shell echo $(BUNDLED_PLUGINS) | sed "s=.*\([EMAIL PROTECTED] ]*\).*=\1=")
+	$(MAKE) $(PLUGIN_ARCHIVES)/$(shell echo $(BUNDLED_PLUGINS) | sed "s=.*\([EMAIL PROTECTED] ]*\).*=\1=")
 	$(MAKE) $(CHANDLERBIN)/$(SNAP)/$(shell echo $(PLUGINS_INST) | sed "s=.*\([EMAIL PROTECTED] ]*\).*=\1=")




_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits