fix setup

resources/macosx/couchapp.pmdoc/01couchapp-contents.xml

@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="couchapp" o="root" g="staff" p="33261" pt="/Users/benoitc/pyinstaller-1.5-rc1/Couchapp/dist/couchapp" m="false" t="file"><mod>owner</mod></f></pkg-contents>
+<pkg-contents spec="1.12"><f n="couchapp" o="benoitc" g="staff" p="33261" pt="/Users/benoitc/build_py26/pyinstaller/utils/dist/couchapp" m="false" t="file"/></pkg-contents>

resources/macosx/couchapp.pmdoc/01couchapp.xml

@@ -1 +1 @@
-<pkgref spec="1.12" uuid="DED89CAF-7594-4787-B4A8-C08FFA8BB378"><config><identifier>com.couchapp.couchapp.couchapp.pkg</identifier><version>0.7.5</version><description/><post-install type="none"/><requireAuthorization/><installFrom>/Users/benoitc/pyinstaller-1.5-rc1/Couchapp/dist/couchapp</installFrom><installTo mod="true">/usr/bin</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installTo.path</mod><mod>parent</mod><mod>installTo</mod><mod>version</mod></config><contents><file-list>01couchapp-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="DED89CAF-7594-4787-B4A8-C08FFA8BB378"><config><identifier>com.couchapp.couchapp.couchapp.pkg</identifier><version>0.8.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true">/Users/benoitc/build_py26/pyinstaller/utils/dist/couchapp</installFrom><installTo mod="true">/usr/bin</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installTo.isAbsoluteType</mod><mod>parent</mod><mod>installTo</mod><mod>version</mod></config><contents><file-list>01couchapp-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

resources/macosx/couchapp.pmdoc/02templates-contents.xml

@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="templates" o="benoitc" g="staff" p="16877" pt="/Users/benoitc/build/couchapp/couchapp/templates" m="false" t="file"><f n="app" o="benoitc" g="staff" p="16877"><f n="_attachments" o="benoitc" g="staff" p="16877"><f n="index.html" o="benoitc" g="staff" p="33188"/><f n="style" o="benoitc" g="staff" p="16877"><f n="main.css" o="benoitc" g="staff" p="33188"/></f></f><f n="couchapp.json" o="benoitc" g="staff" p="33188"/><f n="evently" o="benoitc" g="staff" p="16877"><f n="items" o="benoitc" g="staff" p="16877"><f n="_changes" o="benoitc" g="staff" p="16877"><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="query.json" o="benoitc" g="staff" p="33188"/></f></f><f n="profile" o="benoitc" g="staff" p="16877"><f n="profileReady" o="benoitc" g="staff" p="16877"><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f></f></f><f n="language" o="benoitc" g="staff" p="33188"/><f n="README.md" o="benoitc" g="staff" p="33188"/><f n="views" o="benoitc" g="staff" p="16877"><f n="recent-items" o="benoitc" g="staff" p="16877"><f n="map.js" o="benoitc" g="staff" p="33188"/></f></f></f><f n="functions" o="benoitc" g="staff" p="16877"><f n="filter.js" o="benoitc" g="staff" p="33188"/><f n="list.js" o="benoitc" g="staff" p="33188"/><f n="map.js" o="benoitc" g="staff" p="33188"/><f n="reduce.js" o="benoitc" g="staff" p="33188"/><f n="show.js" o="benoitc" g="staff" p="33188"/><f n="spatial.js" o="benoitc" g="staff" p="33188"/><f n="update.js" o="benoitc" g="staff" p="33188"/><f n="validate_doc_update.js" o="benoitc" g="staff" p="33188"/></f><f n="vendor" o="benoitc" g="staff" p="16877"><f n="_attachments" o="benoitc" g="staff" p="16877"><f n="jquery.couch.app.js" o="benoitc" g="staff" p="33188"/><f n="jquery.couch.app.util.js" o="benoitc" g="staff" p="33188"/><f n="jquery.evently.js" o="benoitc" g="staff" p="33188"/><f n="jquery.mustache.js" o="benoitc" g="staff" p="33188"/><f n="jquery.pathbinder.js" o="benoitc" g="staff" p="33188"/><f n="loader.js" o="benoitc" g="staff" p="33188"/></f><f n="evently" o="benoitc" g="staff" p="16877"><f n="account" o="benoitc" g="staff" p="16877"><f n="_init.js" o="benoitc" g="staff" p="33188"/><f n="adminParty" o="benoitc" g="staff" p="16877"><f n="mustache.html" o="benoitc" g="staff" p="33188"/></f><f n="doLogin.js" o="benoitc" g="staff" p="33188"/><f n="doLogout.js" o="benoitc" g="staff" p="33188"/><f n="doSignup.js" o="benoitc" g="staff" p="33188"/><f n="loggedIn" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors.json" o="benoitc" g="staff" p="33188"/></f><f n="loggedOut" o="benoitc" g="staff" p="16877"><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors.json" o="benoitc" g="staff" p="33188"/></f><f n="loginForm" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="a[href=#signup].json" o="benoitc" g="staff" p="33188"/><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f><f n="signupForm" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="a[href=#login].json" o="benoitc" g="staff" p="33188"/><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f></f><f n="profile" o="benoitc" g="staff" p="16877"><f n="loggedIn.js" o="benoitc" g="staff" p="33188"/><f n="loggedOut" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/></f><f n="noProfile" o="benoitc" g="staff" p="16877"><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f><f n="profileReady" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/></f></f><f n="README.md" o="benoitc" g="staff" p="33188"/></f><f n="lib" o="benoitc" g="staff" p="16877"><f n="atom.js" o="benoitc" g="staff" p="33188"/><f n="cache.js" o="benoitc" g="staff" p="33188"/><f n="code.js" o="benoitc" g="staff" p="33188"/><f n="docform.js" o="benoitc" g="staff" p="33188"/><f n="linkup.js" o="benoitc" g="staff" p="33188"/><f n="list.js" o="benoitc" g="staff" p="33188"/><f n="markdown.js" o="benoitc" g="staff" p="33188"/><f n="md5.js" o="benoitc" g="staff" p="33188"/><f n="mustache.js" o="benoitc" g="staff" p="33188"/><f n="path.js" o="benoitc" g="staff" p="33188"/><f n="redirect.js" o="benoitc" g="staff" p="33188"/><f n="utils.js" o="benoitc" g="staff" p="33188"/><f n="validate.js" o="benoitc" g="staff" p="33188"/></f><f n="metadata.json" o="benoitc" g="staff" p="33188"/></f></f></pkg-contents>
+<pkg-contents spec="1.12"><f n="templates" o="benoitc" g="staff" p="16877" pt="/Users/benoitc/build_py26/couchapp/couchapp/templates" m="false" t="file"><f n="app" o="benoitc" g="staff" p="16877"><f n="_attachments" o="benoitc" g="staff" p="16877"><f n="index.html" o="benoitc" g="staff" p="33188"/><f n="style" o="benoitc" g="staff" p="16877"><f n="main.css" o="benoitc" g="staff" p="33188"/></f></f><f n="couchapp.json" o="benoitc" g="staff" p="33188"/><f n="evently" o="benoitc" g="staff" p="16877"><f n="items" o="benoitc" g="staff" p="16877"><f n="_changes" o="benoitc" g="staff" p="16877"><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="query.json" o="benoitc" g="staff" p="33188"/></f></f><f n="profile" o="benoitc" g="staff" p="16877"><f n="profileReady" o="benoitc" g="staff" p="16877"><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f></f></f><f n="language" o="benoitc" g="staff" p="33188"/><f n="README.md" o="benoitc" g="staff" p="33188"/><f n="views" o="benoitc" g="staff" p="16877"><f n="recent-items" o="benoitc" g="staff" p="16877"><f n="map.js" o="benoitc" g="staff" p="33188"/></f></f></f><f n="functions" o="benoitc" g="staff" p="16877"><f n="filter.js" o="benoitc" g="staff" p="33188"/><f n="list.js" o="benoitc" g="staff" p="33188"/><f n="map.js" o="benoitc" g="staff" p="33188"/><f n="reduce.js" o="benoitc" g="staff" p="33188"/><f n="show.js" o="benoitc" g="staff" p="33188"/><f n="spatial.js" o="benoitc" g="staff" p="33188"/><f n="update.js" o="benoitc" g="staff" p="33188"/><f n="validate_doc_update.js" o="benoitc" g="staff" p="33188"/></f><f n="vendor" o="benoitc" g="staff" p="16877"><f n="_attachments" o="benoitc" g="staff" p="16877"><f n="jquery.couch.app.js" o="benoitc" g="staff" p="33188"/><f n="jquery.couch.app.util.js" o="benoitc" g="staff" p="33188"/><f n="jquery.evently.js" o="benoitc" g="staff" p="33188"/><f n="jquery.mustache.js" o="benoitc" g="staff" p="33188"/><f n="jquery.pathbinder.js" o="benoitc" g="staff" p="33188"/><f n="loader.js" o="benoitc" g="staff" p="33188"/></f><f n="evently" o="benoitc" g="staff" p="16877"><f n="account" o="benoitc" g="staff" p="16877"><f n="_init.js" o="benoitc" g="staff" p="33188"/><f n="adminParty" o="benoitc" g="staff" p="16877"><f n="mustache.html" o="benoitc" g="staff" p="33188"/></f><f n="doLogin.js" o="benoitc" g="staff" p="33188"/><f n="doLogout.js" o="benoitc" g="staff" p="33188"/><f n="doSignup.js" o="benoitc" g="staff" p="33188"/><f n="loggedIn" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors.json" o="benoitc" g="staff" p="33188"/></f><f n="loggedOut" o="benoitc" g="staff" p="16877"><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors.json" o="benoitc" g="staff" p="33188"/></f><f n="loginForm" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="a[href=#signup].json" o="benoitc" g="staff" p="33188"/><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f><f n="signupForm" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="a[href=#login].json" o="benoitc" g="staff" p="33188"/><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f></f><f n="profile" o="benoitc" g="staff" p="16877"><f n="loggedIn.js" o="benoitc" g="staff" p="33188"/><f n="loggedOut" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/></f><f n="noProfile" o="benoitc" g="staff" p="16877"><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/><f n="selectors" o="benoitc" g="staff" p="16877"><f n="form" o="benoitc" g="staff" p="16877"><f n="submit.js" o="benoitc" g="staff" p="33188"/></f></f></f><f n="profileReady" o="benoitc" g="staff" p="16877"><f n="after.js" o="benoitc" g="staff" p="33188"/><f n="data.js" o="benoitc" g="staff" p="33188"/><f n="mustache.html" o="benoitc" g="staff" p="33188"/></f></f><f n="README.md" o="benoitc" g="staff" p="33188"/></f><f n="lib" o="benoitc" g="staff" p="16877"><f n="atom.js" o="benoitc" g="staff" p="33188"/><f n="cache.js" o="benoitc" g="staff" p="33188"/><f n="code.js" o="benoitc" g="staff" p="33188"/><f n="docform.js" o="benoitc" g="staff" p="33188"/><f n="linkup.js" o="benoitc" g="staff" p="33188"/><f n="list.js" o="benoitc" g="staff" p="33188"/><f n="markdown.js" o="benoitc" g="staff" p="33188"/><f n="md5.js" o="benoitc" g="staff" p="33188"/><f n="mustache.js" o="benoitc" g="staff" p="33188"/><f n="path.js" o="benoitc" g="staff" p="33188"/><f n="redirect.js" o="benoitc" g="staff" p="33188"/><f n="utils.js" o="benoitc" g="staff" p="33188"/><f n="validate.js" o="benoitc" g="staff" p="33188"/></f><f n="metadata.json" o="benoitc" g="staff" p="33188"/></f></f></pkg-contents>

resources/macosx/couchapp.pmdoc/02templates.xml

@@ -1 +1 @@
-<pkgref spec="1.12" uuid="10AC3C19-BC4B-488A-8733-69BC86F75899"><config><identifier>com.couchapp.couchapp.templates.pkg</identifier><version>0.7.5</version><description/><post-install type="none"/><requireAuthorization/><installFrom includeRoot="true">/Users/benoitc/build/couchapp/couchapp/templates</installFrom><installTo mod="true">/Users/benoitc/Library/Application Support/Couchapp</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installTo.path</mod><mod>includeRoot</mod><mod>parent</mod><mod>installTo</mod><mod>version</mod></config><contents><file-list>02templates-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="10AC3C19-BC4B-488A-8733-69BC86F75899"><config><identifier>com.couchapp.couchapp.templates.pkg</identifier><version>0.8.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true" includeRoot="true">/Users/benoitc/build_py26/couchapp/couchapp/templates</installFrom><installTo mod="true">/usr/share/couchapp</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.isRelativeType</mod><mod>installTo</mod><mod>installTo.isAbsoluteType</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>includeRoot</mod></config><contents><file-list>02templates-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

resources/macosx/couchapp.pmdoc/index.xml

@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Couchapp</title><build>/Users/benoitc/build/couchapp/Output/Couchapp-0.7.5.pkg</build><organization>com.couchapp</organization><userSees ui="both"/><min-target os="3"/><domain system="true" user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="Couchapp binary" id="choice3" description="Main couchapp binary" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.couchapp.couchapp.couchapp.pkg"/></choice><choice title="Couchapp Templates" id="choice4" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.couchapp.couchapp.templates.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mod="true" type="license">/Users/benoitc/build/couchapp/resources/macosx/LICENSE.txt</resource><resource mod="true" type="readme">/Users/benoitc/build/couchapp/resources/macosx/Readme.html</resource><resource mod="true" type="welcome">/Users/benoitc/build/couchapp/resources/macosx/Welcome.html</resource></locale></resources><flags/><item type="file">01couchapp.xml</item><item type="file">02templates.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
+<pkmkdoc spec="1.12"><properties><title>Couchapp</title><build>/Users/benoitc/build_py26/pyinstaller/Couchapp-0.8.0.pkg</build><organization>com.couchapp</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="Couchapp binary" id="choice3" description="Main couchapp binary" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.couchapp.couchapp.couchapp.pkg"/></choice><choice title="Couchapp Templates" id="choice4" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.couchapp.couchapp.templates.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mod="true" type="license">/Users/benoitc/build/couchapp/resources/macosx/LICENSE.txt</resource><resource mod="true" type="readme">/Users/benoitc/build_py26/couchapp/resources/macosx/Readme.html</resource><resource mod="true" type="welcome">/Users/benoitc/build_py26/couchapp/resources/macosx/Welcome.html</resource></locale></resources><flags/><item type="file">01couchapp.xml</item><item type="file">02templates.xml</item><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>

resources/win32/README.build

@@ -17,7 +17,7 @@ Prerequities:
  http:https://sourceforge.net/projects/py2exe/
 
  Inno Setup program:
- http:https://sourceforge.net/projects/py2exe/
+ http:https://www.jrsoftware.org/isinfo.php
 
  ISTool (optionnal)
  http:https://www.istool.org/default.aspx/

setup.py

@@ -22,6 +22,9 @@
 setup_requires = []
 extra = {}
 
+couchapp = load_source("couchapp", os.path.join("couchapp",
+ "__init__.py"))
+
 SELECT_BACKPORT_MACROS = []
 
 if "linux" in sys.platform:
@@ -170,7 +173,7 @@ def get_scripts():
  extra['console'] = [{
  'script': os.path.join("resources", "scripts", "couchapp"),
  'copyright':'Copyright (C) 2008-2011 Benoît Chesneau and others',
- 'product_version': __version__ 
+ 'product_version': couchapp.__version__ 
  }]
 
 
@@ -226,8 +229,7 @@ def build_extension(self, ext):
 
 
 def main():
- couchapp = load_source("couchapp", os.path.join("couchapp",
- "__init__.py"))
+
 
  # read long description
  with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f: