commits
Mon, 30 Oct 2006 20:23:43 -0800
--- trunk/chandler/Makefile 2006-10-31 02:03:36 UTC (rev 12151) +++ trunk/chandler/Makefile 2006-10-31 04:23:36 UTC (rev 12152) @@ -16,6 +16,8 @@ Chandler-PhotoPlugin \ EggTranslations-Plugin +PYEGGS = $(CHANDLERARCHIVES)/configobj-4.3.2-py$(PYTHON_VER).egg + # When a version changes, the ARCHIVES lists below needs to be updated. # these get installed into release or debug ARCHIVES = $(CHANDLERARCHIVES)/Launchers-$(SNAP)-0.8-$(BP)G.tar.gz \ @@ -130,7 +132,7 @@ endif endif -# readline is only needed for OSX +# readline is only needed for OS X ifeq ($(OS),Darwin) ARCHIVES += $(CHANDLERARCHIVES)/readline-$(SNAP)-5.1-$(BP)2.tar.gz endif @@ -146,8 +148,9 @@ CURL=curl $(CHANDLER_CURL_OPTIONS) -f -o endif -HOST = builds.osafoundation.org -URL = "" +HOST = builds.osafoundation.org +URL = "" +P_URL = $(URL)/$(PLATFORM) SETUPTOOLS_EGG = $(CHANDLERARCHIVES)/setuptools-0.6c4dev_r52047-py2.4.egg SETUPTOOLS_ABS = $(SETUPTOOLS_EGG) @@ -178,6 +181,11 @@ $(addprefix $(C_BIN)/$(SNAP)/, \ $(notdir $(ARCHIVES)))) +PYEGGS_INST = \ + $(addsuffix .inst, \ + $(addprefix $(C_BIN)/$(SNAP)/, \ + $(notdir $(PYEGGS)))) + downloads: $(ARCHIVES) $(addprefix binaries-, $(BUILD_PLUGINS)): @@ -211,15 +219,27 @@ $(ARCHIVES): mkdir -p $(CHANDLERARCHIVES) - $(CURL) $@ $(URL)/$(notdir $@) + $(CURL) $@ $(P_URL)/$(notdir $@) $(ARCHIVES_INST): tar -C $(C_BIN) -xvzf $(CHANDLERARCHIVES)/$(notdir $(basename $@)) touch $@ +$(PYEGGS): + mkdir -p $(CHANDLERARCHIVES) + $(CURL) $@ $(P_URL)/$(notdir $@) + +$(PYEGGS_INST): + MACOSX_DEPLOYMENT_TARGET= PYTHONPATH='$(PLUGIN_INST)' CHANDLERHOME='$(CHANDLERHOME)' $(PYTHON_BIN) \ + -c "from setuptools.command.easy_install import main; main()" \ + --script-dir='$(SETUPTOOLS_BIN)' \ + --install-dir='$(PLUGIN_INST)' \ + $(CHANDLERARCHIVES)/$(notdir $(basename $@)) + touch $@ + $(SETUPTOOLS_EGG): mkdir -p $(CHANDLERARCHIVES) - $(CURL) $@ http://$(HOST)/external/$(notdir $@) + $(CURL) $@ $(URL)/$(notdir $@) setuptools: $(SETUPTOOLS_EGG) MACOSX_DEPLOYMENT_TARGET= PYTHONPATH='$(PLUGIN_INST)' CHANDLERHOME='$(CHANDLERHOME)' $(PYTHON_BIN) \ @@ -240,7 +260,7 @@ install-core: $(ARCHIVES) $(ARCHIVES_INST) manifest_exe -install-plugin-core: setuptools chandler-locale-data +install-plugin-core: setuptools chandler-locale-data $(PYEGGS_INST) plugins: install-plugin-core build-plugins @@ -248,7 +268,7 @@ distrib: install-core install-plugin-core distrib-plugins -download: $(ARCHIVES) $(SETUPTOOLS_EGG) +download: $(ARCHIVES) $(SETUPTOOLS_EGG) $(PYEGGS) # to install individual binaries, for example: make chandlerdb
--- trunk/chandler/NOTICE.txt 2006-10-31 02:03:36 UTC (rev 12151) +++ trunk/chandler/NOTICE.txt 2006-10-31 04:23:36 UTC (rev 12152) @@ -214,6 +214,42 @@ */ +external/configobj + + Copyright (c) 2003-2006, Michael Foord + All rights reserved. + E-mail : fuzzyman AT voidspace DOT org DOT uk + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Michael Foord nor the name of Voidspace + may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + external/dateutil B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON @@ -686,7 +722,7 @@ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). -external/readline +external/readline (OS X) /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
_______________________________________________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits