summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
Diffstat (limited to 'setup')
-rwxr-xr-xsetup/package.py213
-rw-r--r--setup/redhat/install.sh3
-rw-r--r--setup/redhat/postinstall.sh92
-rwxr-xr-xsetup/win32/setup.nsi7
-rwxr-xr-xsetup/win32/static/getfiles.sh28
-rw-r--r--setup/win32/static/pixmaps/openerp-header.bmpbin19038 -> 0 bytes
-rw-r--r--setup/win32/static/pixmaps/openerp-icon.icobin2238 -> 2238 bytes
-rw-r--r--setup/win32/static/pixmaps/openerp-intro.bmpbin206054 -> 154542 bytes
-rw-r--r--setup/win32/static/pixmaps/openerp-slogan.bmpbin142054 -> 106554 bytes
-rw-r--r--setup/win32/static/pixmaps/openerp.icobin4286 -> 0 bytes
10 files changed, 201 insertions, 142 deletions
diff --git a/setup/package.py b/setup/package.py
index 7f90c5cea9c..3047be9dc64 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -32,6 +32,7 @@ import xmlrpclib
from contextlib import contextmanager
from glob import glob
from os.path import abspath, dirname, join
+from sys import stdout
from tempfile import NamedTemporaryFile
@@ -40,18 +41,23 @@ from tempfile import NamedTemporaryFile
#----------------------------------------------------------
execfile(join(dirname(__file__), '..', 'openerp', 'release.py'))
version = version.split('-')[0]
-
-timestamp = time.strftime("%Y%m%d-%H%M%S", time.gmtime())
+GPGPASSPHRASE = os.getenv('GPGPASSPHRASE')
+GPGID = os.getenv('GPGID')
+timestamp = time.strftime("%Y%m%d", time.gmtime())
PUBLISH_DIRS = {
- 'tar.gz': 'src',
- 'exe': 'exe',
- 'deb': 'deb',
- 'dsc': 'deb',
- 'changes': 'deb',
- 'deb.tar.gz': ['deb', 'tar.gz'],
- 'noarch.rpm': 'rpm',
- 'src.rpm': 'rpm',
+ 'debian': 'deb',
+ 'redhat': 'rpm',
+ 'tarball': 'src',
+ 'windows': 'exe',
}
+EXTENSIONS = [
+ '.tar.gz',
+ '.deb',
+ '.dsc',
+ '.changes',
+ '.noarch.rpm',
+ '.exe',
+]
def mkdir(d):
if not os.path.isdir(d):
@@ -90,25 +96,31 @@ def _rpc_count_modules(addr='http://127.0.0.1', port=8069, dbname='mycompany'):
print("Package test: FAILED. Not able to install base.")
raise Exception("Installation of package failed")
-def publish(o, releases):
+def publish(o, type, releases):
def _publish(o, release):
- extension = ''.join(release.split('.', 1)[1])
- release_extension = PUBLISH_DIRS[extension][1] if isinstance(PUBLISH_DIRS[extension], list) else extension
- release_dir = PUBLISH_DIRS[extension][0] if isinstance(PUBLISH_DIRS[extension], list) else PUBLISH_DIRS[extension]
-
- release_filename = 'odoo_%s-%s.%s' % (version, timestamp, release_extension)
+ arch = ''
+ filename = release.split(os.path.sep)[-1]
+
+ extension = None
+ for EXTENSION in EXTENSIONS:
+ if filename.endswith(EXTENSION):
+ extension = EXTENSION
+ filename = filename.replace(extension, '')
+ break
+ if extension is None:
+ raise Exception("Extension of %s is not handled" % filename)
+
+ # keep _all or _amd64
+ if filename.count('_') > 1:
+ arch = '_' + filename.split('_')[-1]
+
+ release_dir = PUBLISH_DIRS[type]
+ release_filename = 'odoo_%s.%s%s%s' % (version, timestamp, arch, extension)
release_path = join(o.pub, release_dir, release_filename)
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])
- with open(os.path.join(o.pub, 'deb', 'Packages'), 'w') as out:
- subprocess.call(['dpkg-scanpackages', '.'], stdout=out, cwd=temp_path)
- shutil.rmtree(temp_path)
-
# Latest/symlink handler
release_abspath = abspath(release_path)
latest_abspath = release_abspath.replace(timestamp, 'latest')
@@ -118,11 +130,15 @@ def publish(o, releases):
os.symlink(release_abspath, latest_abspath)
+ return release_path
+
+ published = []
if isinstance(releases, basestring):
- _publish(o, releases)
+ published.append(_publish(o, releases))
elif isinstance(releases, list):
for release in releases:
- _publish(o, release)
+ published.append(_publish(o, release))
+ return published
class OdooDocker(object):
def __init__(self):
@@ -254,19 +270,24 @@ def _prepare_build_dir(o):
def build_tgz(o):
system(['python2', 'setup.py', '--quiet', 'sdist'], o.build_dir)
- system(['cp', glob('%s/dist/openerp-*.tar.gz' % o.build_dir)[0], '%s/odoo.tar.gz' % o.build_dir])
+ system(['cp', glob('%s/dist/odoo-*.tar.gz' % o.build_dir)[0], '%s/odoo.tar.gz' % o.build_dir])
def build_deb(o):
- system(['dpkg-buildpackage', '-rfakeroot', '-uc', '-us'], 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])
+ deb = pexpect.spawn('dpkg-buildpackage -rfakeroot -k%s' % GPGID, cwd=o.build_dir)
+ deb.logfile = stdout
+ deb.expect_exact('Enter passphrase: ', timeout=1200)
+ deb.send(GPGPASSPHRASE + '\r\n')
+ deb.expect_exact('Enter passphrase: ')
+ deb.send(GPGPASSPHRASE + '\r\n')
+ deb.expect(pexpect.EOF)
+ system(['mv', glob('%s/../odoo_*.deb' % o.build_dir)[0], '%s' % o.build_dir])
+ system(['mv', glob('%s/../odoo_*.dsc' % o.build_dir)[0], '%s' % o.build_dir])
+ system(['mv', glob('%s/../odoo_*_amd64.changes' % o.build_dir)[0], '%s' % o.build_dir])
+ system(['mv', glob('%s/../odoo_*.tar.gz' % o.build_dir)[0], '%s' % o.build_dir])
def build_rpm(o):
system(['python2', 'setup.py', '--quiet', 'bdist_rpm'], o.build_dir)
- system(['cp', glob('%s/dist/openerp-*.noarch.rpm' % o.build_dir)[0], '%s/odoo.noarch.rpm' % o.build_dir])
- system(['cp', glob('%s/dist/openerp-*.src.rpm' % o.build_dir)[0], '%s/odoo.src.rpm' % o.build_dir])
+ system(['cp', glob('%s/dist/odoo-*.noarch.rpm' % o.build_dir)[0], '%s/odoo.noarch.rpm' % o.build_dir])
def build_exe(o):
KVMWinBuildExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_winxp_login).start()
@@ -295,7 +316,7 @@ def test_tgz(o):
def test_deb(o):
with docker('debian:stable', o.build_dir, o.pub) as wheezy:
- wheezy.release = 'odoo.deb'
+ wheezy.release = '*.deb'
wheezy.system('/usr/bin/apt-get update -qq && /usr/bin/apt-get upgrade -qq -y')
wheezy.system("apt-get install postgresql -y")
wheezy.system("service postgresql start")
@@ -310,27 +331,83 @@ def test_deb(o):
def test_rpm(o):
with docker('centos:centos7', o.build_dir, o.pub) as centos7:
centos7.release = 'odoo.noarch.rpm'
- centos7.system('rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-2.noarch.rpm')
- centos7.system('yum update -y && yum upgrade -y')
- centos7.system('yum install python-pip gcc python-devel -y')
- centos7.system('pip install pydot pyPdf vatnumber xlwt http://download.gna.org/pychart/PyChart-1.39.tar.gz')
- centos7.system('yum install postgresql postgresql-server postgresql-libs postgresql-contrib postgresql-devel -y')
+ # Dependencies
+ centos7.system('yum install -d 0 -e 0 epel-release -y')
+ centos7.system('yum update -d 0 -e 0 -y')
+ # Manual install/start of postgres
+ centos7.system('yum install -d 0 -e 0 postgresql postgresql-server postgresql-libs postgresql-contrib postgresql-devel -y')
centos7.system('mkdir -p /var/lib/postgres/data')
centos7.system('chown -R postgres:postgres /var/lib/postgres/data')
centos7.system('chmod 0700 /var/lib/postgres/data')
centos7.system('su postgres -c "initdb -D /var/lib/postgres/data -E UTF-8"')
centos7.system('cp /usr/share/pgsql/postgresql.conf.sample /var/lib/postgres/data/postgresql.conf')
centos7.system('su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"')
+ centos7.system('sleep 5')
centos7.system('su postgres -c "createdb mycompany"')
- centos7.system('export PYTHONPATH=${PYTHONPATH}:/usr/local/lib/python2.7/dist-packages')
- centos7.system('su postgres -c "createdb mycompany"')
- centos7.system('yum install /opt/release/%s -y' % centos7.release)
+ # Odoo install
+ centos7.system('yum install -d 0 -e 0 /opt/release/%s -y' % centos7.release)
centos7.system('su odoo -s /bin/bash -c "openerp-server -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"')
centos7.system('su odoo -s /bin/bash -c "openerp-server -c /etc/odoo/openerp-server.conf -d mycompany &"')
def test_exe(o):
KVMWinTestExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_winxp_login).start()
+#---------------------------------------------------------
+# Generates Packages, Sources and Release files of debian package
+#---------------------------------------------------------
+def gen_deb_package(o, published_files):
+ # Executes command to produce file_name in path, and moves it to o.pub/deb
+ def _gen_file(o, (command, file_name), path):
+ cur_tmp_file_path = os.path.join(path, file_name)
+ with open(cur_tmp_file_path, 'w') as out:
+ subprocess.call(command, stdout=out, cwd=path)
+ system(['cp', cur_tmp_file_path, os.path.join(o.pub, 'deb', file_name)])
+
+ # Copy files to a temp directory (required because the working directory must contain only the
+ # files of the last release)
+ temp_path = tempfile.mkdtemp(suffix='debPackages')
+ for pub_file_path in published_files:
+ system(['cp', pub_file_path, temp_path])
+
+ commands = [
+ (['dpkg-scanpackages', '.'], "Packages"), # Generate Packages file
+ (['dpkg-scansources', '.'], "Sources"), # Generate Sources file
+ (['apt-ftparchive', 'release', '.'], "Release") # Generate Release file
+ ]
+ # Generate files
+ for command in commands:
+ _gen_file(o, command, temp_path)
+ # Remove temp directory
+ shutil.rmtree(temp_path)
+
+ # Generate Release.gpg (= signed Release)
+ # Options -abs: -a (Create ASCII armored output), -b (Make a detach signature), -s (Make a signature)
+ subprocess.call(['gpg', '--default-key', GPGID, '--passphrase', GPGPASSPHRASE, '--yes', '-abs', '--no-tty', '-o', 'Release.gpg', 'Release'], cwd=os.path.join(o.pub, 'deb'))
+
+#---------------------------------------------------------
+# Generates an RPM repo
+#---------------------------------------------------------
+def gen_rpm_repo(o, file_name):
+ # Sign the RPM
+ rpmsign = pexpect.spawn('/bin/bash', ['-c', 'rpm --resign %s' % file_name], cwd=os.path.join(o.pub, 'rpm'))
+ rpmsign.expect_exact('Enter pass phrase: ')
+ rpmsign.send(GPGPASSPHRASE + '\r\n')
+ rpmsign.expect(pexpect.EOF)
+
+ # Removes the old repodata
+ subprocess.call(['rm', '-rf', os.path.join(o.pub, 'rpm', 'repodata')])
+
+ # Copy files to a temp directory (required because the working directory must contain only the
+ # files of the last release)
+ temp_path = tempfile.mkdtemp(suffix='rpmPackages')
+ subprocess.call(['cp', file_name, temp_path])
+
+ subprocess.call(['createrepo', temp_path]) # creates a repodata folder in temp_path
+ subprocess.call(['cp', '-r', os.path.join(temp_path, "repodata"), os.path.join(o.pub, 'rpm')])
+
+ # Remove temp directory
+ shutil.rmtree(temp_path)
+
#----------------------------------------------------------
# Options and Main
#----------------------------------------------------------
@@ -362,6 +439,7 @@ def options():
o.version_full = '%s-%s' % (o.version, timestamp)
o.work = join(o.build_dir, 'openerp-%s' % o.version_full)
o.work_addons = join(o.work, 'openerp', 'addons')
+
return o
def main():
@@ -370,42 +448,47 @@ def main():
try:
if not o.no_tarball:
build_tgz(o)
- if not o.no_testing:
- try:
+ try:
+ if not o.no_testing:
test_tgz(o)
- publish(o, 'odoo.tar.gz')
- except Exception, e:
- print("Won't publish the tgz release.\n Exception: %s" % str(e))
+ published_files = publish(o, 'tarball', ['odoo.tar.gz'])
+ except Exception, e:
+ print("Won't publish the tgz release.\n Exception: %s" % str(e))
if not o.no_debian:
build_deb(o)
- if not o.no_testing:
- try:
+ try:
+ if not o.no_testing:
test_deb(o)
- publish(o, ['odoo.deb', 'odoo.dsc', 'odoo_amd64.changes', 'odoo.deb.tar.gz'])
- except Exception, e:
- print("Won't publish the deb release.\n Exception: %s" % str(e))
+
+ to_publish = []
+ to_publish.append(glob("%s/odoo_*.deb" % o.build_dir)[0])
+ to_publish.append(glob("%s/odoo_*.dsc" % o.build_dir)[0])
+ to_publish.append(glob("%s/odoo_*.changes" % o.build_dir)[0])
+ to_publish.append(glob("%s/odoo_*.tar.gz" % o.build_dir)[0])
+ published_files = publish(o, 'debian', to_publish)
+ gen_deb_package(o, published_files)
+ except Exception, e:
+ print("Won't publish the deb release.\n Exception: %s" % str(e))
if not o.no_rpm:
build_rpm(o)
- if not o.no_testing:
- try:
+ try:
+ if not o.no_testing:
test_rpm(o)
- publish(o, ['odoo.noarch.rpm', 'odoo.src.rpm'])
- except Exception, e:
- print("Won't publish the rpm release.\n Exception: %s" % str(e))
+ published_files = publish(o, 'redhat', ['odoo.noarch.rpm'])
+ gen_rpm_repo(o, published_files[0])
+ except Exception, e:
+ print("Won't publish the rpm release.\n Exception: %s" % str(e))
if not o.no_windows:
build_exe(o)
- if not o.no_testing:
- try:
+ try:
+ if not o.no_testing:
test_exe(o)
- publish(o, 'odoo.exe')
- except Exception, e:
- print("Won't publish the exe release.\n Exception: %s" % str(e))
+ published_files = publish(o, 'windows', ['odoo.exe'])
+ except Exception, e:
+ print("Won't publish the exe release.\n Exception: %s" % str(e))
except:
pass
finally:
- for leftover in glob('%s/../odoo_*' % o.build_dir):
- os.remove(leftover)
-
shutil.rmtree(o.build_dir)
print('Build dir %s removed' % o.build_dir)
diff --git a/setup/redhat/install.sh b/setup/redhat/install.sh
new file mode 100644
index 00000000000..e214d04acff
--- /dev/null
+++ b/setup/redhat/install.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+python setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh
index 437fdcec426..c7e5e9d8eb2 100644
--- a/setup/redhat/postinstall.sh
+++ b/setup/redhat/postinstall.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -e
@@ -25,7 +25,7 @@ db_host = False
db_port = False
db_user = $ODOO_USER
db_password = False
-addons_path = /usr/local/lib/python2.7/dist-packages/openerp/addons
+addons_path = /usr/lib/python2.7/site-packages/openerp/addons
" > $ODOO_CONFIGURATION_FILE
chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
chmod 0640 $ODOO_CONFIGURATION_FILE
@@ -37,81 +37,21 @@ chmod 0750 $ODOO_LOG_DIR
mkdir -p $ODOO_DATA_DIR
chown $ODOO_USER:$ODOO_GROUP $ODOO_DATA_DIR
-INIT_FILE=/etc/init.d/openerp
+INIT_FILE=/lib/systemd/system/odoo.service
touch $INIT_FILE
chmod 0700 $INIT_FILE
-# FIXME this is a copy of debian/init file.
-# If anyone know how to tell bdist_rpm to use this file directly...
cat << 'EOF' > $INIT_FILE
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides: openerp-server
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start openerp daemon at boot time
-# Description: Enable service provided by daemon.
-# X-Interactive: true
-### END INIT INFO
-## more info: http://wiki.debian.org/LSBInitScripts
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
-DAEMON=/usr/bin/openerp-server
-NAME=openerp
-DESC=openerp
-CONFIG=/etc/odoo/openerp-server.conf
-LOGFILE=/var/log/odoo/openerp-server.log
-PIDFILE=/var/run/${NAME}.pid
-USER=odoo
-export LOGNAME=$USER
-
-test -x $DAEMON || exit 0
-set -e
-
-function _start() {
- start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER:$USER --background --make-pidfile --exec $DAEMON -- --config $CONFIG --logfile $LOGFILE
-}
-
-function _stop() {
- start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --retry 3
- rm -f $PIDFILE
-}
-
-function _status() {
- start-stop-daemon --status --quiet --pidfile $PIDFILE
- return $?
-}
-
-
-case "$1" in
- start)
- echo -n "Starting $DESC: "
- _start
- echo "ok"
- ;;
- stop)
- echo -n "Stopping $DESC: "
- _stop
- echo "ok"
- ;;
- restart|force-reload)
- echo -n "Restarting $DESC: "
- _stop
- sleep 1
- _start
- echo "ok"
- ;;
- status)
- echo -n "Status of $DESC: "
- _status && echo "running" || echo "stopped"
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
+[Unit]
+Description=Odoo Open Source ERP and CRM
+After=network.target
+
+[Service]
+Type=simple
+User=odoo
+Group=odoo
+ExecStart=/usr/bin/odoo.py --config=/etc/odoo/openerp-server.conf
+
+[Install]
+WantedBy=multi-user.target
EOF
+easy_install pyPdf vatnumber pydot
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index c7841e99c76..62f3ce8cf9b 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -238,6 +238,10 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
File "start.bat"
File "stop.bat"
+ SetOutPath "$INSTDIR\thirdparty"
+ File /r "${STATIC_PATH}\wkhtmltopdf\*"
+ File /r "${STATIC_PATH}\less\*"
+
# If there is a previous install of the OpenERP Server, keep the login/password from the config file
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername
@@ -245,6 +249,7 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
# Fix the addons path
WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\openerp\addons"
+ WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "bin_path" "$INSTDIR\thirdparty"
# if we're going to install postgresql force it's path,
# otherwise we consider it's always done and/or correctly tune by users
@@ -324,7 +329,7 @@ Section "Uninstall"
Rmdir /r "$INSTDIR\server"
Rmdir /r "$INSTDIR\service"
-
+ Rmdir /r "$INSTDIR\thirdparty"
DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}"
SectionEnd
diff --git a/setup/win32/static/getfiles.sh b/setup/win32/static/getfiles.sh
new file mode 100755
index 00000000000..9d0ebd556ad
--- /dev/null
+++ b/setup/win32/static/getfiles.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# apt-get install p7zip-full
+set -e
+
+mkdir -p wkhtmltopdf less/node_modules
+TEMPDIR=`mktemp -d -t odoo_windows_build_XXXX`
+function cleanup {
+ rm -rf $TEMPDIR
+}
+trap cleanup EXIT
+
+# postgresql
+wget -q http://get.enterprisedb.com/postgresql/postgresql-9.3.5-1-windows.exe
+
+# wkhtmltopdf
+wget -q -P $TEMPDIR http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe
+7z x -o$TEMPDIR $TEMPDIR/wkhtmltox-0.12.1.2_msvc2013-win32.exe
+cp $TEMPDIR/bin/wkhtmltopdf.exe ./wkhtmltopdf
+
+# less
+wget -q -P ./less http://nodejs.org/dist/latest/node.exe
+echo '"%~dp0\node.exe" "%~dp0\.\node_modules\less.js\bin\lessc" %*' > ./less/lessc.cmd
+pushd ./less/node_modules
+wget -q https://github.com/less/less.js/archive/v2.0.0.tar.gz -O - | tar xz && mv less.js-2.0.0 less.js
+wget -q https://github.com/then/promise/archive/6.0.1.tar.gz -O - | tar xz && mv promise-6.0.1 promise
+wget -q https://github.com/kriskowal/asap/archive/v2.0.0.tar.gz -O - | tar xz && mv asap-2.0.0 asap
+wget -q -P $TEMPDIR https://github.com/less/less-plugin-clean-css/archive/clean-css-3.zip
+unzip $TEMPDIR/clean-css-3.zip && mv less-plugin-clean-css-clean-css-3 less-plugin-clean-css-clean-css
diff --git a/setup/win32/static/pixmaps/openerp-header.bmp b/setup/win32/static/pixmaps/openerp-header.bmp
deleted file mode 100644
index 61226b99ad7..00000000000
--- a/setup/win32/static/pixmaps/openerp-header.bmp
+++ /dev/null
Binary files differ
diff --git a/setup/win32/static/pixmaps/openerp-icon.ico b/setup/win32/static/pixmaps/openerp-icon.ico
index 89ed393f7cc..1bb1c899057 100644
--- a/setup/win32/static/pixmaps/openerp-icon.ico
+++ b/setup/win32/static/pixmaps/openerp-icon.ico
Binary files differ
diff --git a/setup/win32/static/pixmaps/openerp-intro.bmp b/setup/win32/static/pixmaps/openerp-intro.bmp
index a7e21abaa7b..92de71c1cea 100644
--- a/setup/win32/static/pixmaps/openerp-intro.bmp
+++ b/setup/win32/static/pixmaps/openerp-intro.bmp
Binary files differ
diff --git a/setup/win32/static/pixmaps/openerp-slogan.bmp b/setup/win32/static/pixmaps/openerp-slogan.bmp
index a3cffd104f2..eab825249c4 100644
--- a/setup/win32/static/pixmaps/openerp-slogan.bmp
+++ b/setup/win32/static/pixmaps/openerp-slogan.bmp
Binary files differ
diff --git a/setup/win32/static/pixmaps/openerp.ico b/setup/win32/static/pixmaps/openerp.ico
deleted file mode 100644
index cde3e961e79..00000000000
--- a/setup/win32/static/pixmaps/openerp.ico
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-23 22:59:21 +0000