- Revision
- 15969
- Author
- vajda
- Date
- 2007-11-29 14:56:21 -0800 (Thu, 29 Nov 2007)
Log Message
merged with trunk:15968
Modified Paths
- branches/64/chandler/Chandler.egg-info/resources/images/ApplicationBarMail-darwin.png
- branches/64/chandler/Chandler.egg-info/resources/images/ApplicationBarMail.png
- branches/64/chandler/Makefile
- branches/64/chandler/distrib/osx/bundle/Info.plist
- branches/64/chandler/parcels/osaf/sharing/accounts.py
- branches/64/chandler/version.py
Diff
Modified: branches/64/chandler/Chandler.egg-info/resources/images/ApplicationBarMail-darwin.png
(Binary files differ)
Modified: branches/64/chandler/Chandler.egg-info/resources/images/ApplicationBarMail.png
(Binary files differ)
Modified: branches/64/chandler/Makefile (15968 => 15969)
--- branches/64/chandler/Makefile 2007-11-29 22:14:01 UTC (rev 15968) +++ branches/64/chandler/Makefile 2007-11-29 22:56:21 UTC (rev 15969) @@ -24,7 +24,10 @@ Chandler-p2pPlugin \ Chandler-gdataPlugin -BUILD_LOCALES = Chandler.en +BUILD_LOCALES = en \ + fr \ + fi \ + sv ifeq ($(OS),Darwin) ifeq ($(shell arch),ppc) @@ -63,7 +66,7 @@ # When a version changes, the ARCHIVES lists below need to be updated. READLINE = $(CHANDLERARCHIVES)/readline-$(SNAP)-5.2-$(BP)2.tar.gz -PYTHON = $(CHANDLERARCHIVES)/python-$(SNAP)-2.5.1-$(BP)8.tar.gz +PYTHON = $(CHANDLERARCHIVES)/python-$(SNAP)-2.5.1-$(BP)9.tar.gz SETUPTOOLS = $(CHANDLERARCHIVES)/setuptools-$(SNAP)-0.6c6-$(BP)2.tar.gz ICU = $(CHANDLERARCHIVES)/icu-$(SNAP)-3.6-$(BP)2.tar.gz OPENJDK = $(CHANDLERARCHIVES)/openjdk-7-ea-j2re-b21-$(BP)3.tar.gz @@ -280,20 +283,22 @@ --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)' + if [ -d "$(C_HOME)/localizations" ]; then \ + svn export http://svn.osafoundation.org/localizations/chandler/trunk/$(subst develop-,,$@) $(C_HOME)/localizations/$(subst develop-,,$@) ; \ + fi -$(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)' +$(addprefix create-, $(BUILD_LOCALES)): + if [ -d "$(C_HOME)/localizations/$(subst create-,,$@)" ]; then \ + $(RUN_PYTHON) tools/createTranslationEgg.py -c --dist \ + -l $(subst create-,,$@) \ + -f $(C_HOME)/localizations/$(subst create-,,$@)/Chandler-$(subst create-,,$@).po \ + -d $(C_HOME)/localizations ; \ + fi $(addprefix install-, $(BUILD_LOCALES)): - cd $(C_HOME)/localizations/$(subst install-,,$@); \ - $(RUN_PYTHON) setup.py egg_info + if [ -f "$(C_HOME)/localizations/Chandler.$(subst install-,,$@)-1.0-$(PYTHON_VER).egg" ]; then \ + $(RUN_PYTHON) -m easy_install $(C_HOME)/localizations/Chandler.$(subst install-,,$@)-1.0-$(PYTHON_VER).egg ; \ + fi chandler-locale-data: $(RUN_PYTHON) setup.py egg_info @@ -328,14 +333,20 @@ install-core: archives manifest_exe chandler-locale-data -plugins: $(addprefix develop-, $(BUILD_PLUGINS)) $(addprefix develop-, $(BUILD_LOCALES)) +develop-locales: $(addprefix develop-, $(BUILD_LOCALES)) +create-locales: $(addprefix create-, $(BUILD_LOCALES)) + +install-locales: create-locales $(addprefix install-, $(BUILD_LOCALES)) + +distrib-locales: create-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/64/chandler/distrib/osx/bundle/Info.plist (15968 => 15969)
--- branches/64/chandler/distrib/osx/bundle/Info.plist 2007-11-29 22:14:01 UTC (rev 15968) +++ branches/64/chandler/distrib/osx/bundle/Info.plist 2007-11-29 22:56:21 UTC (rev 15969) @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>ChandlerApp</string> <key>CFBundleGetInfoString</key> - <string>Chandler 0.7.3.dev from the Open Source Applications Foundation</string> + <string>Chandler 0.7.4.dev from the Open Source Applications Foundation</string> <key>CFBundleIconFile</key> <string>Chandler.icns</string> <key>CFBundleInfoDictionaryVersion</key> @@ -23,7 +23,7 @@ <key>CFBundleSignature</key> <string>CHAN</string> <key>CFBundleVersion</key> - <string>0.7.3.dev</string> + <string>0.7.4.dev</string> <key>CFBundleLocalizations</key> <array> <string>af</string>
Modified: branches/64/chandler/parcels/osaf/sharing/accounts.py (15968 => 15969)
--- branches/64/chandler/parcels/osaf/sharing/accounts.py 2007-11-29 22:14:01 UTC (rev 15968) +++ branches/64/chandler/parcels/osaf/sharing/accounts.py 2007-11-29 22:56:21 UTC (rev 15969) @@ -282,7 +282,7 @@ SharedItem(collection).shares.append(share) if share.exists(): - raise SharingError(_(u"Collection already exists on server.")) + raise errors.SharingError(_(u"Collection already exists on server.")) share.create() # bug 8128, this setDisplayName shouldn't be required, but @@ -329,7 +329,7 @@ SharedItem(collection).shares.append(share) if share.exists(): - raise SharingError(_(u"Collection already exists on server.")) + raise errors.SharingError(_(u"Collection already exists on server.")) share.create() share.put(activity=activity)
Modified: branches/64/chandler/version.py (15968 => 15969)
--- branches/64/chandler/version.py 2007-11-29 22:14:01 UTC (rev 15968) +++ branches/64/chandler/version.py 2007-11-29 22:56:21 UTC (rev 15969) @@ -1,4 +1,4 @@ -_version = { 'release': '0.7.3', +_version = { 'release': '0.7.4', 'build': '.dev', 'checkpoint': None, 'revision': None,
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
