Title: [commits] (bear) [16029] Removing the install of localization eggs until the effort to convert
Revision
16029
Author
bear
Date
2007-12-03 15:12:35 -0800 (Mon, 03 Dec 2007)

Log Message

Removing the install of localization eggs until the effort to convert
them to "true" plugins is done next week. This brings them back
in line with the way it's done in the 0.7.3 branch

Modified Paths

Diff

Modified: trunk/chandler/Makefile (16028 => 16029)

--- trunk/chandler/Makefile	2007-12-03 21:31:17 UTC (rev 16028)
+++ trunk/chandler/Makefile	2007-12-03 23:12:35 UTC (rev 16029)
@@ -13,6 +13,7 @@
 PYTHON_VER   = 2.5
 BP           =
 LOCALE_VER   = trunk
+LOCALE_INST  = 
 
 BUILD_PLUGINS = Chandler-HelloWorldPlugin \
                 Chandler-AmazonPlugin \
@@ -285,6 +286,18 @@
           --script-dir='$(PLUGIN_INST)' \
           --install-dir='$(PLUGIN_INST)' .
 
+ifeq ($(OS),Darwin)
+    ifeq ($(OS_MAJOR_VER),9)
+        LOCALE_INST = --install-dir=$(C_BIN)/$(SNAP)/site-packages
+    endif
+endif
+
+ifeq ($(OS),Linux)
+    ifneq ($(findstring $(DISTRIB_CODENAME),feisty gutsy),)
+        LOCALE_INST = --install-dir=$(C_BIN)/$(SNAP)/site-packages
+    endif
+endif
+
 $(addprefix install-, $(BUILD_LOCALES)):
 	rm -rf $(C_HOME)/localizations/$(subst install-,,$@)
 	svn export http://svn.osafoundation.org/localizations/chandler/$(LOCALE_VER)/$(subst install-,,$@) $(C_HOME)/localizations/$(subst install-,,$@)
@@ -292,8 +305,7 @@
                   -l $(subst install-,,$@) \
                   -f '$(LOCALE_SRC)'$(subst install-,,$@)/Chandler-$(subst install-,,$@).po \
                   -d '$(LOCALE_SRC)'
-	$(RUN_PYTHON) -m easy_install -x --multi-version --install-dir='$(PLUGIN_INST)' \
-                      '$(LOCALE_SRC)'Chandler.$(subst install-,,$@)-1.0-py$(PYTHON_VER).egg
+	$(RUN_PYTHON) -m easy_install -x $(LOCALE_INST) '$(LOCALE_SRC)'Chandler.$(subst install-,,$@)-1.0-py$(PYTHON_VER).egg
 
 chandler-locale-data:
 	$(RUN_PYTHON) setup.py egg_info




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

Reply via email to