Title: [commits] (bear) [15999] porting trunk changes to branch - localization eggs now are installed
Revision
15999
Author
bear
Date
2007-11-30 17:09:08 -0800 (Fri, 30 Nov 2007)

Log Message

porting trunk changes to branch - localization eggs now are installed
into the plugins dir
changed source for plugins from trunk to branches/0.7.3

Modified Paths

Diff

Modified: branches/0.7.3/chandler/Makefile (15998 => 15999)

--- branches/0.7.3/chandler/Makefile	2007-12-01 00:56:04 UTC (rev 15998)
+++ branches/0.7.3/chandler/Makefile	2007-12-01 01:09:08 UTC (rev 15999)
@@ -12,8 +12,7 @@
 OS_MAJOR_VER = $(firstword $(subst ., ,$(OS_VER)))
 PYTHON_VER   = 2.5
 BP           =
-LOCALE_VER   = trunk
-LOCALE_INST  = 
+LOCALE_VER   = branches/0.7.3
 
 BUILD_PLUGINS = Chandler-HelloWorldPlugin \
                 Chandler-AmazonPlugin \
@@ -286,18 +285,6 @@
           --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-,,$@)
@@ -305,7 +292,8 @@
                   -l $(subst install-,,$@) \
                   -f '$(LOCALE_SRC)'$(subst install-,,$@)/Chandler-$(subst install-,,$@).po \
                   -d '$(LOCALE_SRC)'
-	$(RUN_PYTHON) -m easy_install -x $(LOCALE_INST) '$(LOCALE_SRC)'Chandler.$(subst install-,,$@)-1.0-py$(PYTHON_VER).egg
+	$(RUN_PYTHON) -m easy_install -x --multi-version --install-dir='$(PLUGIN_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