- Revision
- 15996
- Author
- bear
- Date
- 2007-11-30 16:07:32 -0800 (Fri, 30 Nov 2007)
Log Message
Made the install use the localized eggs
bug 11246
bug 11246
Modified Paths
- branches/0.7.3/chandler/Makefile
- branches/0.7.3/chandler/tools/build_lib.py
- branches/0.7.3/chandler/tools/distribute.py
Removed Paths
- branches/0.7.3/chandler/localizations/Chandler.en/
Diff
Modified: branches/0.7.3/chandler/Makefile (15995 => 15996)
--- branches/0.7.3/chandler/Makefile 2007-12-01 00:06:34 UTC (rev 15995) +++ branches/0.7.3/chandler/Makefile 2007-12-01 00:07:32 UTC (rev 15996) @@ -12,6 +12,8 @@ OS_MAJOR_VER = $(firstword $(subst ., ,$(OS_VER))) PYTHON_VER = 2.5 BP = +LOCALE_VER = trunk +LOCALE_INST = BUILD_PLUGINS = Chandler-HelloWorldPlugin \ Chandler-AmazonPlugin \ @@ -24,7 +26,10 @@ Chandler-p2pPlugin \ Chandler-gdataPlugin -BUILD_LOCALES = Chandler.en +BUILD_LOCALES = en \ + fr \ + fi \ + sv ifeq ($(OS),Darwin) ifeq ($(shell arch),ppc) @@ -39,11 +44,15 @@ ifeq ($(OS),Linux) PLATFORM = linux + ARCH = $(shell uname -m) DISTRIB_CODENAME = $(subst DISTRIB_CODENAME=,,$(shell cat /etc/lsb-release | grep DISTRIB_CODENAME)) ifneq ($(findstring $(DISTRIB_CODENAME),feisty gutsy),) PLATFORM := $(PLATFORM)/$(DISTRIB_CODENAME) endif + ifeq ($(ARCH),x86_64) + PLATFORM := $(PLATFORM)/$(ARCH) + endif endif ifeq ($(findstring CYGWIN,$(OS)),CYGWIN) @@ -69,7 +78,7 @@ ZOPE = $(CHANDLERARCHIVES)/zope.interface-$(SNAP)-3.3.0b2-r71371-$(BP)4.tar.gz ifeq ($(OS),Linux) - READLINE = + READLINE = ifeq ($(PLATFORM),linux/feisty) PYTHON = ICU = @@ -87,6 +96,17 @@ SETUPTOOLS = ZOPE = endif + + ifeq ($(PLATFORM),linux/gutsy/x86_64) + OPENJDK = $(CHANDLERARCHIVES)/openjdk-7-ea-j2re-b23-$(BP)3.tar.gz + OPENSSL = + PYTHON = + ICU = + CONFIGOBJ = + DOCUTILS = + SETUPTOOLS = + ZOPE = + endif endif ifneq ($(findstring $(PLATFORM),macosx maciosx),) @@ -115,8 +135,8 @@ $(OPENSSL) \ $(OPENJDK) \ $(CHANDLERARCHIVES)/m2crypto-$(SNAP)-0.18.2-$(BP)2.tar.gz \ - $(CHANDLERARCHIVES)/PyICU-$(SNAP)-0.6-81-$(BP)2.tar.gz \ - $(CHANDLERARCHIVES)/PyLucene-$(SNAP)-2.2.0-1-359-$(BP)2.tar.gz \ + $(CHANDLERARCHIVES)/PyICU-$(SNAP)-0.8-87-$(BP)1.tar.gz \ + $(CHANDLERARCHIVES)/PyLucene-$(SNAP)-2.2.0-2-367-$(BP)1.tar.gz \ $(CHANDLERARCHIVES)/twisted-$(SNAP)-r18795-$(BP)3.tar.gz \ $(CHANDLERARCHIVES)/wxPython-$(SNAP)-2.8.6.1-r198-$(BP)2.tar.gz \ $(CHANDLERARCHIVES)/dateutil-$(SNAP)-1.1-$(BP)6.tar.gz \ @@ -221,6 +241,7 @@ P_URL = $(URL)/$(PLATFORM) PLUGIN_INST = $(C_HOME)/plugins +LOCALE_SRC = $(C_HOME)/localizations/ TOOLS = $(C_HOME)/tools/ # @@ -230,6 +251,7 @@ # ifeq ($(OS),Cygwin) PLUGIN_INST := $(shell cygpath -aw $(PLUGIN_INST)) + LOCALE_SRC := $(shell cygpath -aw $(LOCALE_SRC))\\ TOOLS := $(shell cygpath -aw $(TOOLS))\\ SCRIPTS := $(shell cygpath -wa $(SCRIPTS))\\ endif @@ -264,21 +286,26 @@ --script-dir='$(PLUGIN_INST)' \ --install-dir='$(PLUGIN_INST)' . -$(addprefix develop-, $(BUILD_LOCALES)): - cd $(C_HOME)/localizations/$(subst develop-,,$@); \ - $(RUN_PYTHON) setup.py egg_info develop \ - --script-dir='$(CHANDLERHOME)' \ - --install-dir='$(CHANDLERHOME)' +ifeq ($(OS),Darwin) + ifeq ($(OS_MAJOR_VER),9) + LOCALE_INST = --install-dir=$(C_BIN)/$(SNAP)/site-packages + endif +endif -$(addprefix develop-u-, $(BUILD_LOCALES)): - cd $(C_HOME)/localizations/$(subst develop-u-,,$@); \ - $(RUN_PYTHON) setup.py egg_info develop -u \ - --script-dir='$(CHANDLERHOME)' \ - --install-dir='$(CHANDLERHOME)' +ifeq ($(OS),Linux) + ifneq ($(findstring $(DISTRIB_CODENAME),feisty gutsy),) + LOCALE_INST = --install-dir=$(C_BIN)/$(SNAP)/site-packages + endif +endif $(addprefix install-, $(BUILD_LOCALES)): - cd $(C_HOME)/localizations/$(subst install-,,$@); \ - $(RUN_PYTHON) setup.py egg_info + rm -rf $(C_HOME)/localizations/$(subst install-,,$@) + svn export http://svn.osafoundation.org/localizations/chandler/$(LOCALE_VER)/$(subst install-,,$@) $(C_HOME)/localizations/$(subst install-,,$@) + $(RUN_PYTHON) tools/createTranslationEgg.py -c --dist \ + -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 chandler-locale-data: $(RUN_PYTHON) setup.py egg_info @@ -311,16 +338,16 @@ archives: $(ARCHIVES) $(ARCHIVES_INST) -install-core: archives manifest_exe chandler-locale-data +install-core: archives manifest_exe chandler-locale-data install-locales -plugins: $(addprefix develop-, $(BUILD_PLUGINS)) $(addprefix develop-, $(BUILD_LOCALES)) +install-locales: $(addprefix install-, $(BUILD_LOCALES)) +plugins: $(addprefix develop-, $(BUILD_PLUGINS)) + no-plugins: $(addprefix develop-u-, $(BUILD_PLUGINS)) distrib-plugins: $(addprefix develop-u-, $(BUILD_PLUGINS)) \ - $(addprefix install-, $(BUILD_PLUGINS)) \ - $(addprefix develop-u-, $(BUILD_LOCALES)) \ - $(addprefix install-, $(BUILD_LOCALES)) + $(addprefix install-, $(BUILD_PLUGINS)) # On Ubuntu Feisty Fawn and Gutsy Gibbon users need to install some packages, # check that we have them:
Modified: branches/0.7.3/chandler/tools/build_lib.py (15995 => 15996)
--- branches/0.7.3/chandler/tools/build_lib.py 2007-12-01 00:06:34 UTC (rev 15995) +++ branches/0.7.3/chandler/tools/build_lib.py 2007-12-01 00:07:32 UTC (rev 15996) @@ -80,7 +80,7 @@ os.setpgid(0, 0) -def runCommand(cmd, env=None, timeout=-1, logger=log): +def runCommand(cmd, env=None, timeout=-1, logger=log, ignorepreexec=False): """ Execute the given command and log all output @@ -127,10 +127,15 @@ else: output = tempfile.TemporaryFile() + if ignorepreexec: + preexec_fn = None + else: + preexec_fn = setpgid_preexec_fn + if redirect: - p = killableprocess.Popen(cmd, env=env, stdin=subprocess.PIPE, stdout=output, stderr=subprocess.STDOUT, preexec_fn=setpgid_preexec_fn) + p = killableprocess.Popen(cmd, env=env, stdin=subprocess.PIPE, stdout=output, stderr=subprocess.STDOUT, preexec_fn=preexec_fn) else: - p = killableprocess.Popen(cmd, env=env, stdin=subprocess.PIPE, preexec_fn=setpgid_preexec_fn) + p = killableprocess.Popen(cmd, env=env, stdin=subprocess.PIPE, preexec_fn=preexec_fn) try: if timeout == -1 and redirect:
Modified: branches/0.7.3/chandler/tools/distribute.py (15995 => 15996)
--- branches/0.7.3/chandler/tools/distribute.py 2007-12-01 00:06:34 UTC (rev 15995) +++ branches/0.7.3/chandler/tools/distribute.py 2007-12-01 00:07:32 UTC (rev 15996) @@ -135,7 +135,7 @@ log('Platform is [%s] -- ignoring tarball request' % options.platformName) if options.dmg: - if options.platformID == 'osx' or options.platformID == 'iosx': + if 'osx' in options.platformID: options.distribs.append('dmg') else: log('Platform is [%s] -- ignoring dmg request' % options.platformName) @@ -212,7 +212,7 @@ # distribDir locally to that .app dir so that handleManifest() # puts things in the right place. - if options.platformID == 'iosx' or options.platformID == 'osx': + if 'osx' in options.platformID: distribDir = os.path.join(options.distribDir, '%s.app' % options.distribName) else: distribDir = options.distribDir
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
