[FIX] Package: Debian, Windows: more odooification; Debian: correct Packages.gz

7 files changed, 70 insertions, 50 deletions

diff --git a/debian/changelog b/debian/changelog
index a1fb384643a..c84bc33eeeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+odoo (8.0.0) stable; urgency=low
+
+  * Renamed package
+
+ -- Simon Lejeune <sle@odoo.com>  Wed, 17 Sep 2014 15:40:00 +0100 
+
 openerp (8.0.0~rc1-0) testing; urgency=low
 
   * Refactored packaging
diff --git a/debian/control b/debian/control
index 7f0fb3a5918..aa082ab9687 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
-Source: openerp
+Source: odoo
 Section: net
 Priority: optional
-Maintainer: Odoo SA <sle@odoo.com>
+Maintainer: OpenERP SA <sle@odoo.com>
 Build-Depends: debhelper (>= 9.0), python, rsync
 Standards-Version: 3.9.5.0
 Homepage: http://www.odoo.com/
 Vcs-Git: https://github.com/odoo/odoo
 
-Package: openerp
+Package: odoo
 Section: net
 Architecture: all
 Depends:
@@ -45,8 +45,8 @@ Depends:
  python-werkzeug,
  python-xlwt,
  python-yaml,
-Conflicts: tinyerp-server, openerp-server, openerp-web
-Replaces: tinyerp-server, openerp-server, openerp-web
+Conflicts: tinyerp-server, openerp-server, openerp-web, openerp
+Replaces: tinyerp-server, openerp-server, openerp-web, openerp
 Recommends:
  antiword,
  graphviz,
diff --git a/debian/copyright b/debian/copyright
index a2e84aafbd3..0866450aa9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Upstream-Contact: OpenERP <info@odoo.com>
+Upstream-Contact: Odoo <info@odoo.com>
 Upstream-Homepage: http://www.odoo.com/
-Maintainer-Contact: Debian OpenERP Maintainers <gnunet@lists.debian-maintainers.org>
+Maintainer-Contact: Debian Odoo Maintainers <gnunet@lists.debian-maintainers.org>
 Maintainer-Homepage: http://www.odoo.com/
 
 Files: *
diff --git a/debian/init b/debian/init
index e333c7eb2a1..ee4c0120db5 100644
--- a/debian/init
+++ b/debian/init
@@ -13,10 +13,10 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 DAEMON=/usr/bin/openerp-server
-NAME=openerp
-DESC=openerp
+NAME=odoo
+DESC=odoo
 CONFIG=/etc/odoo/openerp-server.conf
-LOGFILE=/var/log/odoo/openerp-server.log
+LOGFILE=/var/log/odoo/odoo-server.log
 PIDFILE=/var/run/${NAME}.pid
 USER=odoo
 export LOGNAME=$USER
diff --git a/openerp/release.py b/openerp/release.py
index 6928b72cd5b..6313d07c36e 100644
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -51,6 +51,6 @@ author = 'OpenERP S.A.'
 author_email = 'info@odoo.com'
 license = 'AGPL-3'
 
-nt_service_name = "openerp-server-" + series
+nt_service_name = "odoo-server-" + series
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/setup/package.py b/setup/package.py
index 1e8b9efb310..e3952073ad1 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -25,12 +25,13 @@ import os
 import pexpect
 import shutil
 import signal
+import subprocess
+import tempfile
 import time
 import xmlrpclib
 from contextlib import contextmanager
 from glob import glob
 from os.path import abspath, dirname, join
-from subprocess import check_output
 from tempfile import NamedTemporaryFile
 
 
@@ -73,9 +74,18 @@ def _rpc_count_modules(addr='http://127.0.0.1', port=8069, dbname='mycompany'):
     modules = xmlrpclib.ServerProxy('%s:%s/xmlrpc/object' % (addr, port)).execute(
         dbname, 1, 'admin', 'ir.module.module', 'search', [('state', '=', 'installed')]
     )
-    if modules:
-        print("Package test: successfuly installed %s modules" % len(modules))
+    if modules and len(modules) > 1:
+        time.sleep(1)
+        toinstallmodules = xmlrpclib.ServerProxy('%s:%s/xmlrpc/object' % (addr, port)).execute(
+            dbname, 1, 'admin', 'ir.module.module', 'search', [('state', '=', 'to install')]
+        )
+        if toinstallmodules:
+            print("Package test: FAILED. Not able to install dependencies of base.")
+            raise Exception("Installation of package failed")
+        else:
+            print("Package test: successfuly installed %s modules" % len(modules))
     else:
+        print("Package test: FAILED. Not able to install base.")
         raise Exception("Installation of package failed")
 
 def publish(o, releases):
@@ -90,6 +100,12 @@ def publish(o, releases):
         system('mkdir -p %s' % join(o.pub, release_dir))
         shutil.move(join(o.build_dir, release), release_path)
 
+        if release_extension == 'deb':
+            temp_path = tempfile.mkdtemp(suffix='debPackages')
+            system(['cp', release_path, temp_path])
+            subprocess.Popen('dpkg-scanpackages . /dev/null | gzip -9c > %s' % join(o.pub, 'deb', 'Packages.gz'), shell=True, cwd=temp_path)
+            shutil.rmtree(temp_path)
+
         # Latest/symlink handler
         release_abspath = abspath(release_path)
         latest_abspath = release_abspath.replace(timestamp, 'latest')
@@ -127,7 +143,7 @@ class OdooDocker(object):
         )
         time.sleep(2)  # let the bash start
         self.docker.logfile_read = self.log_file
-        self.id = check_output('docker ps -l -q', shell=True)
+        self.id = subprocess.check_output('docker ps -l -q', shell=True)
 
     def end(self):
         try:
@@ -219,9 +235,9 @@ class KVMWinTestExe(KVM):
 
         self.rsync('"%s" %s@127.0.0.1:' % (setuppath, self.login))
         self.ssh("TEMP=/tmp ./%s /S" % setupfile)
-        self.ssh('PGPASSWORD=openpgpwd /cygdrive/c/"Program Files"/"OpenERP %s"/PostgreSQL/bin/createdb.exe -e -U openpg mycompany' % setupversion)
-        self.ssh('/cygdrive/c/"Program Files"/"OpenERP %s"/server/openerp-server.exe -d mycompany -i base --stop-after-init' % setupversion)
-        self.ssh(['/cygdrive/c/"Program Files"/"OpenERP %s"/server/openerp-server.exe -d mycompany &' % setupversion, '&'])
+        self.ssh('PGPASSWORD=openpgpwd /cygdrive/c/"Program Files"/"Odoo %s"/PostgreSQL/bin/createdb.exe -e -U openpg mycompany' % setupversion)
+        self.ssh('/cygdrive/c/"Program Files"/"Odoo %s"/server/openerp-server.exe -d mycompany -i base --stop-after-init' % setupversion)
+        self.ssh('net start odoo-server-8.0')
         _rpc_count_modules(port=18069)
 
 #----------------------------------------------------------
@@ -239,10 +255,10 @@ def build_tgz(o):
 
 def build_deb(o):
     system(['dpkg-buildpackage', '-rfakeroot', '-uc', '-us'], o.build_dir)
-    system(['cp', glob('%s/../openerp_*.deb' % o.build_dir)[0], '%s/odoo.deb' % o.build_dir])
-    system(['cp', glob('%s/../openerp_*.dsc' % o.build_dir)[0], '%s/odoo.dsc' % o.build_dir])
-    system(['cp', glob('%s/../openerp_*_amd64.changes' % o.build_dir)[0], '%s/odoo_amd64.changes' % o.build_dir])
-    system(['cp', glob('%s/../openerp_*.tar.gz' % o.build_dir)[0], '%s/odoo.deb.tar.gz' % o.build_dir])
+    system(['cp', glob('%s/../odoo_*.deb' % o.build_dir)[0], '%s/odoo.deb' % o.build_dir])
+    system(['cp', glob('%s/../odoo_*.dsc' % o.build_dir)[0], '%s/odoo.dsc' % o.build_dir])
+    system(['cp', glob('%s/../odoo_*_amd64.changes' % o.build_dir)[0], '%s/odoo_amd64.changes' % o.build_dir])
+    system(['cp', glob('%s/../odoo_*.tar.gz' % o.build_dir)[0], '%s/odoo.deb.tar.gz' % o.build_dir])
 
 def build_rpm(o):
     system(['python2', 'setup.py', '--quiet', 'bdist_rpm'], o.build_dir)
@@ -348,7 +364,6 @@ def options():
 def main():
     o = options()
     _prepare_build_dir(o)
-
     try:
         if not o.no_tarball:
             build_tgz(o)
@@ -364,7 +379,6 @@ def main():
                 try:
                     test_deb(o)
                     publish(o, ['odoo.deb', 'odoo.dsc', 'odoo_amd64.changes', 'odoo.deb.tar.gz'])
-                    system('dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz', join(o.pub, 'deb'))
                 except Exception, e:
                     print("Won't publish the deb release.\n Exception: %s" % str(e))
         if not o.no_rpm:
@@ -386,7 +400,7 @@ def main():
     except:
         pass
     finally:
-        for leftover in glob('%s/../openerp_*' % o.build_dir):
+        for leftover in glob('%s/../odoo_*' % o.build_dir):
             os.remove(leftover)
 
         shutil.rmtree(o.build_dir)
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 3a02e4f6785..6afe1e75fd5 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -65,7 +65,7 @@
 !define PUBLISHER 'OpenERP S.A.'

 

 !ifndef MAJOR_VERSION

-    !define MAJOR_VERSION '7'

+    !define MAJOR_VERSION '8'

 !endif

 

 !ifndef MINOR_VERSION

@@ -81,14 +81,14 @@
 #!define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-r${REVISION_VERSION}"

 !endif

 

-!define PRODUCT_NAME "OpenERP"

+!define PRODUCT_NAME "Odoo"

 !define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"

 

 !define REGISTRY_ROOT HKLM

 !define UNINSTALL_BASE_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall"

 !define UNINSTALL_REGISTRY_KEY "${UNINSTALL_BASE_REGISTRY_KEY}\${DISPLAY_NAME}"

 

-!define UNINSTALL_REGISTRY_KEY_SERVER "${UNINSTALL_BASE_REGISTRY_KEY}\OpenERP Server ${VERSION}"

+!define UNINSTALL_REGISTRY_KEY_SERVER "${UNINSTALL_BASE_REGISTRY_KEY}\Odoo Server ${VERSION}"

 

 !define REGISTRY_KEY "Software\${DISPLAY_NAME}"

 

@@ -106,7 +106,7 @@ ShowInstDetails show
 

 XPStyle on

 

-InstallDir "$PROGRAMFILES\OpenERP ${VERSION}"

+InstallDir "$PROGRAMFILES\Odoo ${VERSION}"

 InstallDirRegKey HKCU "${REGISTRY_KEY}" ""

 

 BrandingText '${PRODUCT_NAME} ${VERSION}'

@@ -168,7 +168,7 @@ Page Custom ShowPostgreSQL LeavePostgreSQL
 !define MUI_FINISHPAGE_RUN_TEXT "$(DESC_FinishPageText)"

 !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"

 !define MUI_FINISHPAGE_LINK $(DESC_FinishPage_Link) 

-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openerp.com/contact"

+!define MUI_FINISHPAGE_LINK_LOCATION "https://www.odoo.com/page/contactus"

 !insertmacro MUI_PAGE_FINISH

 

 !insertmacro MUI_UNPAGE_WELCOME

@@ -181,11 +181,11 @@ Page Custom ShowPostgreSQL LeavePostgreSQL
 !insertmacro MUI_RESERVEFILE_LANGDLL

 

 ; English

-LangString DESC_OpenERP_Server ${LANG_ENGLISH} "Install the OpenERP Server with all the OpenERP standard modules."

-LangString DESC_PostgreSQL ${LANG_ENGLISH} "Install the PostgreSQL RDBMS used by OpenERP."

-LangString DESC_FinishPage_Link ${LANG_ENGLISH} "Contact OpenERP for Partnership and/or Support"

+LangString DESC_OpenERP_Server ${LANG_ENGLISH} "Install the Odoo Server with all the Odoo standard modules."

+LangString DESC_PostgreSQL ${LANG_ENGLISH} "Install the PostgreSQL RDBMS used by Odoo."

+LangString DESC_FinishPage_Link ${LANG_ENGLISH} "Contact Odoo for Partnership and/or Support"

 LangString DESC_AtLeastOneComponent ${LANG_ENGLISH} "You have to choose at least one component"

-LangString DESC_CanNotInstallPostgreSQL ${LANG_ENGLISH} "You can not install the PostgreSQL database without the OpenERP Server"

+LangString DESC_CanNotInstallPostgreSQL ${LANG_ENGLISH} "You can not install the PostgreSQL database without the Odoo Server"

 LangString WARNING_HostNameIsEmpty ${LANG_ENGLISH} "The hostname for the connection to the PostgreSQL Server is empty"

 LangString WARNING_UserNameIsEmpty ${LANG_ENGLISH} "The username for the connection to the PostgreSQL Server is empty"

 LangString WARNING_PasswordIsEmpty ${LANG_ENGLISH} "The password for the connection to the PostgreSQL Server is empty"

@@ -197,16 +197,16 @@ LangString DESC_PostgreSQL_Username ${LANG_ENGLISH} "Username"
 LangString DESC_PostgreSQL_Password ${LANG_ENGLISH} "Password"

 LangString Profile_AllInOne ${LANG_ENGLISH} "All In One"

 LangString Profile_Server ${LANG_ENGLISH} "Server only"

-LangString TITLE_OpenERP_Server ${LANG_ENGLISH} "OpenERP Server"

+LangString TITLE_OpenERP_Server ${LANG_ENGLISH} "Odoo Server"

 LangString TITLE_PostgreSQL ${LANG_ENGLISH} "PostgreSQL Database"

-LangString DESC_FinishPageText ${LANG_ENGLISH} "Start OpenERP"

+LangString DESC_FinishPageText ${LANG_ENGLISH} "Start Odoo"

 

 ; French

-LangString DESC_OpenERP_Server ${LANG_FRENCH} "Installation du Serveur OpenERP avec tous les modules OpenERP standards."

-LangString DESC_PostgreSQL ${LANG_FRENCH} "Installation de la base de donn?es PostgreSQL utilis?e par OpenERP."

-LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez OpenERP pour un Partenariat et/ou du Support"

+LangString DESC_OpenERP_Server ${LANG_FRENCH} "Installation du Serveur Odoo avec tous les modules Odoo standards."

+LangString DESC_PostgreSQL ${LANG_FRENCH} "Installation de la base de donn?es PostgreSQL utilis?e par Odoo."

+LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez Odoo pour un Partenariat et/ou du Support"

 LangString DESC_AtLeastOneComponent ${LANG_FRENCH} "Vous devez choisir au moins un composant"

-LangString DESC_CanNotInstallPostgreSQL ${LANG_FRENCH} "Vous ne pouvez pas installer la base de donn?es PostgreSQL sans le serveur OpenERP"

+LangString DESC_CanNotInstallPostgreSQL ${LANG_FRENCH} "Vous ne pouvez pas installer la base de donn?es PostgreSQL sans le serveur Odoo"

 LangString WARNING_HostNameIsEmpty ${LANG_FRENCH} "L'adresse pour la connection au serveur PostgreSQL est vide"

 LangString WARNING_UserNameIsEmpty ${LANG_FRENCH} "Le nom d'utilisateur pour la connection au serveur PostgreSQL est vide"

 LangString WARNING_PasswordIsEmpty ${LANG_FRENCH} "Le mot de passe pour la connection au serveur PostgreSQL est vide"

@@ -218,9 +218,9 @@ LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"
 LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"

 LangString Profile_AllInOne ${LANG_FRENCH} "All In One"

 LangString Profile_Server ${LANG_FRENCH} "Seulement le serveur"

-LangString TITLE_OpenERP_Server ${LANG_FRENCH} "Serveur OpenERP"

+LangString TITLE_OpenERP_Server ${LANG_FRENCH} "Serveur Odoo"

 LangString TITLE_PostgreSQL ${LANG_FRENCH} "Installation du serveur de base de donn?es PostgreSQL"

-LangString DESC_FinishPageText ${LANG_FRENCH} "Démarrer OpenERP"

+LangString DESC_FinishPageText ${LANG_FRENCH} "Démarrer Odoo"

 

 InstType $(Profile_AllInOne)

 InstType $(Profile_Server)

@@ -256,10 +256,10 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
     nsExec::Exec '"$INSTDIR\service\win32_service.exe" -auto -install'

 

     # TODO: don't hardcode the service name

-    nsExec::Exec "net stop openerp-server-8.0"

+    nsExec::Exec "net stop odoo-server-8.0"

     sleep 2

 

-    nsExec::Exec "net start openerp-server-8.0"

+    nsExec::Exec "net start odoo-server-8.0"

     sleep 2

 

 SectionEnd

@@ -282,7 +282,7 @@ Section $(TITLE_PostgreSQL) SectionPostgreSQL
         --mode unattended \

         --prefix "$INSTDIR\PostgreSQL" \

         --datadir "$INSTDIR\PostgreSQL\data" \

-        --servicename "PostgreSQL_For_OpenERP" \

+        --servicename "PostgreSQL_For_Odoo" \

         --serviceaccount "openpgsvc" --servicepassword "0p3npgsvcPWD" \

         --superaccount "$TextPostgreSQLUsername" --superpassword "$TextPostgreSQLPassword" \

         --serverport $TextPostgreSQLPort'

@@ -297,10 +297,10 @@ Section -Post
 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"

 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"

 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"

-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@openerp.com"

+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@odoo.com"

     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+32.81.81.37.00"

-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com"

-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com"

+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "https://www.odoo.com"

+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@odoo.com"

     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"

     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"

     WriteUninstaller "$INSTDIR\Uninstall.exe"

@@ -318,8 +318,8 @@ Section "Uninstall"
     ReadRegStr $0 HKLM "${UNINSTALL_REGISTRY_KEY_SERVER}" "UninstallString"

     ExecWait '"$0" /S'

 

-    nsExec::Exec "net stop openerp-server-8.0"

-    nsExec::Exec "sc delete openerp-server-8.0"

+    nsExec::Exec "net stop odoo-server-8.0"

+    nsExec::Exec "sc delete odoo-server-8.0"

     sleep 2

 

     Rmdir /r "$INSTDIR\server"