mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2025-02-25 18:55:21 -06:00
[FIX] more fixes for package build
This commit is contained in:
erp
12
debian/control
vendored
12
debian/control
vendored
@@ -1,15 +1,15 @@
|
||||
Source: odoo
|
||||
Source: flectra
|
||||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: Odoo S.A. <info@odoo.com>
|
||||
Maintainer: FlectraHQ <info@flectrahq.com>
|
||||
Uploaders: Aaron Bohy <aab@odoo.com>, Simon Lejeune <sle@odoo.com>
|
||||
Build-Depends: debhelper-compat (= 12), dh-python, python3, rsync, python3-setuptools
|
||||
Standards-Version: 4.5.0
|
||||
Homepage: http://www.odoo.com/
|
||||
Vcs-Git: https://github.com/odoo/odoo
|
||||
Vcs-Browser: https://github.com/odoo/odoo
|
||||
Homepage: http://www.flectrahq.com/
|
||||
Vcs-Git: https://gitlab.com/flectrahq/flectra
|
||||
Vcs-Browser: https://gitlab.com/flectrahq/flectra
|
||||
|
||||
Package: odoo
|
||||
Package: flectra
|
||||
Architecture: all
|
||||
Depends:
|
||||
${misc:Depends},
|
||||
|
||||
20
debian/copyright
vendored
20
debian/copyright
vendored
@@ -1,15 +1,15 @@
|
||||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Contact: Odoo <info@odoo.com>
|
||||
Upstream-Contact: FlectraHQ <info@flectrahq.com>
|
||||
|
||||
Files: *
|
||||
Copyright: Copyright (C) 2004-2015 Odoo SA. (www.odoo.com)
|
||||
License: LGPL-3+
|
||||
|
||||
Files: odoo/tools/appdirs.py
|
||||
Files: flectra/tools/appdirs.py
|
||||
Copyright: 2005-2010 ActiveState Software Inc; 2013 Eddy Petrișor
|
||||
License: MIT
|
||||
|
||||
Files: odoo/tools/lru.py
|
||||
Files: flectra/tools/lru.py
|
||||
Copyright: 2003 Josiah Carlson
|
||||
License: PSF
|
||||
Comment: Was published by the author without license info on activestate but
|
||||
@@ -241,7 +241,7 @@ Files: addons/web/static/lib/benchmarkjs/lodash.js
|
||||
Copyright: JS Foundation and other contributors; Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
|
||||
License: MIT
|
||||
|
||||
Files: addons/web/static/lib/bootstrap/* doc/_extensions/odoo_ext/static/style.css doc/_extensions/odoo_ext/static/bootstrap.js
|
||||
Files: addons/web/static/lib/bootstrap/* doc/_extensions/flectra_ext/static/style.css doc/_extensions/flectra_ext/static/bootstrap.js
|
||||
Copyright: 2011-2019 The Bootstrap Authors; 2011-2019 Twitter, Inc
|
||||
License: MIT
|
||||
|
||||
@@ -414,7 +414,7 @@ Files: addons/web/static/src/js/libs/download.js
|
||||
Copyright: 2016 dandavis
|
||||
License: MIT
|
||||
|
||||
Files: addons/web/static/src/js/libs/zoomodoo.js
|
||||
Files: addons/web/static/src/js/libs/zoomflectra.js
|
||||
Copyright: 2013 Matt Hinchliffe
|
||||
License: MIT
|
||||
|
||||
@@ -446,11 +446,11 @@ Files: addons/website_google_map/static/src/lib/markerclusterer.js
|
||||
Copyright: 2010 Google Inc
|
||||
License: Apache-2.0
|
||||
|
||||
Files: doc/_extensions/odoo_ext/pygments_override.py
|
||||
Files: doc/_extensions/flectra_ext/pygments_override.py
|
||||
Copyright: The Pygments team
|
||||
License: BSD-2
|
||||
|
||||
Files: doc/_extensions/odoo_ext/static/bootstrap-3.3.6/*
|
||||
Files: doc/_extensions/flectra_ext/static/bootstrap-3.3.6/*
|
||||
Copyright: 2011-2015 Twitter Inc
|
||||
License: MIT
|
||||
|
||||
@@ -462,16 +462,16 @@ Files: doc/_extensions/pyjsparser/*
|
||||
Copyright: 2014-2017 Piotr Dabkowski
|
||||
License: MIT
|
||||
|
||||
Files: odoo/__init__.py
|
||||
Files: flectra/__init__.py
|
||||
Copyright: 2010-2012 Daniele Varrazzo
|
||||
License: BSD-3
|
||||
Comment: This license only applies to the function 'gevent_wait_callback'
|
||||
|
||||
Files: odoo/addons/base/tests/test_res_partner_bank.py
|
||||
Files: flectra/addons/base/tests/test_res_partner_bank.py
|
||||
Copyright: 2015 ACSONE SA/NV
|
||||
License: LGPL-3+
|
||||
|
||||
Files: odoo/tools/_vendor/sessions.py
|
||||
Files: flectra/tools/_vendor/sessions.py
|
||||
Copyright: 2007 Pallets
|
||||
License: BSD-3
|
||||
|
||||
|
||||
4
debian/flectra.conf
vendored
4
debian/flectra.conf
vendored
@@ -3,6 +3,6 @@
|
||||
; admin_passwd = admin
|
||||
db_host = False
|
||||
db_port = False
|
||||
db_user = odoo
|
||||
db_user = flectra
|
||||
db_password = False
|
||||
;addons_path = /usr/lib/python3/dist-packages/odoo/addons
|
||||
;addons_path = /usr/lib/python3/dist-packages/flectra/addons
|
||||
|
||||
46
debian/flectra.links
vendored
46
debian/flectra.links
vendored
@@ -1,23 +1,23 @@
|
||||
usr/share/fonts/truetype/inconsolata/Inconsolata.otf usr/lib/python3/dist-packages/odoo/addons/point_of_sale/static/src/fonts/Inconsolata.otf
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff usr/lib/python3/dist-packages/odoo/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff2 usr/lib/python3/dist-packages/odoo/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.eot usr/lib/python3/dist-packages/odoo/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
|
||||
usr/share/fonts-font-awesome/fonts/FontAwesome.otf usr/lib/python3/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/FontAwesome.otf
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff usr/lib/python3/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff2
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff2 usr/lib/python3/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
|
||||
usr/share/javascript/underscore/underscore.js usr/lib/python3/dist-packages/odoo/addons/web/static/lib/underscore/underscore.js
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Black.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Black.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BlackItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BlackItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Bold.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Bold.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BoldItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BoldItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Italic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Italic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Light.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Light.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-LightItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-LightItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Medium.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Medium.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-MediumItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-MediumItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Regular.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Regular.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Thin.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Thin.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-ThinItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-ThinItalic.ttf
|
||||
usr/share/fonts/truetype/inconsolata/Inconsolata.otf usr/lib/python3/dist-packages/flectra/addons/point_of_sale/static/src/fonts/Inconsolata.otf
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff usr/lib/python3/dist-packages/flectra/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff2 usr/lib/python3/dist-packages/flectra/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
|
||||
usr/share/fonts-glyphicons/glyphicons-halflings-regular.eot usr/lib/python3/dist-packages/flectra/addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
|
||||
usr/share/fonts-font-awesome/fonts/FontAwesome.otf usr/lib/python3/dist-packages/flectra/addons/web/static/lib/fontawesome/fonts/FontAwesome.otf
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff usr/lib/python3/dist-packages/flectra/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff2
|
||||
usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff2 usr/lib/python3/dist-packages/flectra/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
|
||||
usr/share/javascript/underscore/underscore.js usr/lib/python3/dist-packages/flectra/addons/web/static/lib/underscore/underscore.js
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Black.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-Black.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BlackItalic.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-BlackItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Bold.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-Bold.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BoldItalic.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-BoldItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Italic.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-Italic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Light.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-Light.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-LightItalic.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-LightItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Medium.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-Medium.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-MediumItalic.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-MediumItalic.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Regular.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-Regular.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Thin.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-Thin.ttf
|
||||
usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-ThinItalic.ttf usr/lib/python3/dist-packages/flectra/addons/web/static/src/fonts/google/Roboto/Roboto-ThinItalic.ttf
|
||||
|
||||
8
debian/flectra.service
vendored
8
debian/flectra.service
vendored
@@ -1,12 +1,12 @@
|
||||
[Unit]
|
||||
Description=Odoo Open Source ERP and CRM
|
||||
Description=Flectra Open Source ERP and CRM
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=odoo
|
||||
Group=odoo
|
||||
ExecStart=/usr/bin/odoo --config /etc/odoo/odoo.conf --logfile /var/log/odoo/odoo-server.log
|
||||
User=flectra
|
||||
Group=flectra
|
||||
ExecStart=/usr/bin/flectra --config /etc/flectra/flectra.conf --logfile /var/log/flectra/flectra-server.log
|
||||
KillMode=mixed
|
||||
|
||||
[Install]
|
||||
|
||||
16
debian/init
vendored
16
debian/init
vendored
@@ -1,11 +1,11 @@
|
||||
#!/bin/bash
|
||||
### BEGIN INIT INFO
|
||||
# Provides: odoo
|
||||
# Provides: flectra
|
||||
# Required-Start: $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs $syslog
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Start odoo daemon at boot time
|
||||
# Short-Description: Start flectra daemon at boot time
|
||||
# Description: Enable service provided by daemon.
|
||||
# X-Interactive: true
|
||||
### END INIT INFO
|
||||
@@ -14,13 +14,13 @@
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
|
||||
DAEMON=/usr/bin/odoo
|
||||
NAME=odoo
|
||||
DESC=odoo
|
||||
CONFIG=/etc/odoo/odoo.conf
|
||||
LOGFILE=/var/log/odoo/odoo-server.log
|
||||
DAEMON=/usr/bin/flectra
|
||||
NAME=flectra
|
||||
DESC=flectra
|
||||
CONFIG=/etc/flectra/flectra.conf
|
||||
LOGFILE=/var/log/flectra/flectra-server.log
|
||||
PIDFILE=/var/run/${NAME}.pid
|
||||
USER=odoo
|
||||
USER=flectra
|
||||
export LOGNAME=$USER
|
||||
|
||||
test -x $DAEMON || exit 0
|
||||
|
||||
4
debian/install
vendored
4
debian/install
vendored
@@ -1,2 +1,2 @@
|
||||
debian/odoo.conf /etc/odoo
|
||||
README.md /usr/share/doc/odoo
|
||||
debian/flectra.conf /etc/flectra
|
||||
README.md /usr/share/doc/flectra
|
||||
|
||||
2
debian/logrotate
vendored
2
debian/logrotate
vendored
@@ -1,4 +1,4 @@
|
||||
/var/log/odoo/*.log {
|
||||
/var/log/flectra/*.log {
|
||||
copytruncate
|
||||
missingok
|
||||
notifempty
|
||||
|
||||
30
debian/postinst
vendored
30
debian/postinst
vendored
@@ -2,28 +2,28 @@
|
||||
|
||||
set -e
|
||||
|
||||
ODOO_CONFIGURATION_FILE=/etc/odoo/odoo.conf
|
||||
ODOO_GROUP="odoo"
|
||||
ODOO_DATA_DIR=/var/lib/odoo
|
||||
ODOO_LOG_DIR=/var/log/odoo
|
||||
ODOO_USER="odoo"
|
||||
FLECTRA_CONFIGURATION_FILE=/etc/flectra/flectra.conf
|
||||
FLECTRA_GROUP="flectra"
|
||||
FLECTRA_DATA_DIR=/var/lib/flectra
|
||||
FLECTRA_LOG_DIR=/var/log/flectra
|
||||
FLECTRA_USER="flectra"
|
||||
|
||||
case "${1}" in
|
||||
configure)
|
||||
if ! getent passwd | grep -q "^odoo:"; then
|
||||
adduser --system --home $ODOO_DATA_DIR --quiet --group $ODOO_USER
|
||||
if ! getent passwd | grep -q "^flectra:"; then
|
||||
adduser --system --home $FLECTRA_DATA_DIR --quiet --group $FLECTRA_USER
|
||||
fi
|
||||
# Register "$ODOO_USER" as a postgres user with "Create DB" role attribute
|
||||
su - postgres -c "createuser -d -R -S $ODOO_USER" 2> /dev/null || true
|
||||
# Register "$FLECTRA_USER" as a postgres user with "Create DB" role attribute
|
||||
su - postgres -c "createuser -d -R -S $FLECTRA_USER" 2> /dev/null || true
|
||||
# Configuration file
|
||||
chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
|
||||
chmod 0640 $ODOO_CONFIGURATION_FILE
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_CONFIGURATION_FILE
|
||||
chmod 0640 $FLECTRA_CONFIGURATION_FILE
|
||||
# Log
|
||||
mkdir -p $ODOO_LOG_DIR
|
||||
chown $ODOO_USER:$ODOO_GROUP $ODOO_LOG_DIR
|
||||
chmod 0750 $ODOO_LOG_DIR
|
||||
mkdir -p $FLECTRA_LOG_DIR
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_LOG_DIR
|
||||
chmod 0750 $FLECTRA_LOG_DIR
|
||||
# Data dir
|
||||
chown $ODOO_USER:$ODOO_GROUP $ODOO_DATA_DIR
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_DATA_DIR
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
|
||||
14
debian/postrm
vendored
14
debian/postrm
vendored
@@ -2,19 +2,19 @@
|
||||
|
||||
set -e
|
||||
|
||||
ODOO_LIB_DIR=/var/lib/odoo
|
||||
ODOO_USER="odoo"
|
||||
ODOO_GROUP="odoo"
|
||||
FLECTRA_LIB_DIR=/var/lib/flectra
|
||||
FLECTRA_USER="flectra"
|
||||
FLECTRA_GROUP="flectra"
|
||||
|
||||
case "${1}" in
|
||||
remove)
|
||||
deluser --quiet --system $ODOO_USER || true
|
||||
delgroup --quiet --system --only-if-empty $ODOO_GROUP || true
|
||||
deluser --quiet --system $FLECTRA_USER || true
|
||||
delgroup --quiet --system --only-if-empty $FLECTRA_GROUP || true
|
||||
;;
|
||||
|
||||
purge)
|
||||
if [ -d "$ODOO_LIB_DIR" ]; then
|
||||
rm -rf $ODOO_LIB_DIR
|
||||
if [ -d "$FLECTRA_LIB_DIR" ]; then
|
||||
rm -rf $FLECTRA_LIB_DIR
|
||||
fi
|
||||
;;
|
||||
|
||||
|
||||
12
debian/rules
vendored
12
debian/rules
vendored
@@ -1,21 +1,21 @@
|
||||
#!/usr/bin/make -f
|
||||
export DH_VERBOSE=1
|
||||
export PYBUILD_NAME=odoo-bin
|
||||
export PYBUILD_NAME=flectra-bin
|
||||
export PYBUILD_DISABLE=test
|
||||
|
||||
%:
|
||||
dh ${@} --with=python3 --buildsystem=pybuild
|
||||
|
||||
override_dh_auto_build:
|
||||
cp -r addons/* odoo/addons/
|
||||
cp -r addons/* flectra/addons/
|
||||
dh_auto_build
|
||||
|
||||
override_dh_auto_install:
|
||||
dh_auto_install
|
||||
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/point_of_sale/static/src/fonts/Inconsolata.otf
|
||||
for LINKTARGET in `awk '{ print $2 }' odoo.links`; do rm debian/odoo/${LINKTARGET} ; done
|
||||
find debian/odoo -name LICENSE.txt -exec rm {} \;
|
||||
rm debian/flectra/usr/lib/python3*/dist-packages/flectra/addons/point_of_sale/static/src/fonts/Inconsolata.otf
|
||||
for LINKTARGET in `awk '{ print $2 }' flectra.links`; do rm debian/flectra/${LINKTARGET} ; done
|
||||
find debian/flectra -name LICENSE.txt -exec rm {} \;
|
||||
|
||||
override_dh_auto_clean:
|
||||
dh_auto_clean
|
||||
for d in addons/* ; do rm -fr odoo/$$d ; done
|
||||
for d in addons/* ; do rm -fr flectra/$$d ; done
|
||||
|
||||
0
setup/package.py
Normal file → Executable file
0
setup/package.py
Normal file → Executable file
@@ -46,7 +46,7 @@ touch $INIT_FILE
|
||||
chmod 0700 $INIT_FILE
|
||||
cat << EOF > $INIT_FILE
|
||||
[Unit]
|
||||
Description=Odoo Open Source ERP and CRM
|
||||
Description=Flectra Open Source ERP and CRM
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
|
||||
0
setup/requirements-check.py
Normal file → Executable file
0
setup/requirements-check.py
Normal file → Executable file
@@ -40,10 +40,10 @@ Unicode True
|
||||
Exch $R2
|
||||
!macroend
|
||||
|
||||
!define PUBLISHER 'Odoo S.A.'
|
||||
!define PUBLISHER 'FlectaHQ'
|
||||
|
||||
!ifndef MAJOR_VERSION
|
||||
!define MAJOR_VERSION '14'
|
||||
!define MAJOR_VERSION '2'
|
||||
!endif
|
||||
|
||||
!ifndef MINOR_VERSION
|
||||
@@ -67,16 +67,16 @@ Unicode True
|
||||
!endif
|
||||
|
||||
!ifndef TOOLSDIR
|
||||
!define TOOLSDIR 'c:\odoobuild'
|
||||
!define TOOLSDIR 'c:\flectrabuild'
|
||||
!endif
|
||||
|
||||
!define PRODUCT_NAME "Odoo"
|
||||
!define PRODUCT_NAME "Flectra"
|
||||
!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"
|
||||
|
||||
!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}\Odoo Server ${VERSION}"
|
||||
!define UNINSTALL_REGISTRY_KEY_SERVER "${UNINSTALL_BASE_REGISTRY_KEY}\Flectra Server ${VERSION}"
|
||||
|
||||
!define REGISTRY_KEY "SOFTWARE\${DISPLAY_NAME}"
|
||||
|
||||
@@ -87,7 +87,7 @@ Unicode True
|
||||
|
||||
Name '${DISPLAY_NAME}'
|
||||
Caption "${PRODUCT_NAME} ${VERSION} Setup"
|
||||
OutFile "odoo_setup_${VERSION}.exe"
|
||||
OutFile "flectra_setup_${VERSION}.exe"
|
||||
SetCompressor /FINAL lzma
|
||||
ShowInstDetails show
|
||||
|
||||
@@ -153,11 +153,11 @@ Page Custom ShowPostgreSQL LeavePostgreSQL
|
||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||
|
||||
; English
|
||||
LangString DESC_Odoo_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_Flectra_Server ${LANG_ENGLISH} "Install the Flectra Server with all the Flectra standard modules."
|
||||
LangString DESC_PostgreSQL ${LANG_ENGLISH} "Install the PostgreSQL RDBMS used by Flectra."
|
||||
LangString DESC_FinishPage_Link ${LANG_ENGLISH} "Contact Flectra 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 Odoo Server"
|
||||
LangString DESC_CanNotInstallPostgreSQL ${LANG_ENGLISH} "You can not install the PostgreSQL database without the Flectra 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"
|
||||
@@ -169,16 +169,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_Odoo_Server ${LANG_ENGLISH} "Odoo Server"
|
||||
LangString TITLE_Flectra_Server ${LANG_ENGLISH} "Flectra Server"
|
||||
LangString TITLE_PostgreSQL ${LANG_ENGLISH} "PostgreSQL Database"
|
||||
LangString DESC_FinishPageText ${LANG_ENGLISH} "Start Odoo"
|
||||
LangString DESC_FinishPageText ${LANG_ENGLISH} "Start Flectra"
|
||||
|
||||
; French
|
||||
LangString DESC_Odoo_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_Flectra_Server ${LANG_FRENCH} "Installation du Serveur Flectra avec tous les modules Odoo standards."
|
||||
LangString DESC_PostgreSQL ${LANG_FRENCH} "Installation de la base de données PostgreSQL utilisée par Flectra."
|
||||
LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez Flectra 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 Odoo"
|
||||
LangString DESC_CanNotInstallPostgreSQL ${LANG_FRENCH} "Vous ne pouvez pas installer la base de données PostgreSQL sans le serveur Flectra"
|
||||
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"
|
||||
@@ -190,14 +190,14 @@ 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_Odoo_Server ${LANG_FRENCH} "Serveur Odoo"
|
||||
LangString TITLE_Flectra_Server ${LANG_FRENCH} "Serveur Flectra"
|
||||
LangString TITLE_PostgreSQL ${LANG_FRENCH} "Installation du serveur de base de données PostgreSQL"
|
||||
LangString DESC_FinishPageText ${LANG_FRENCH} "Démarrer Odoo"
|
||||
LangString DESC_FinishPageText ${LANG_FRENCH} "Démarrer Flectra"
|
||||
|
||||
InstType $(Profile_AllInOne)
|
||||
InstType $(Profile_Server)
|
||||
|
||||
Section $(TITLE_Odoo_Server) SectionOdoo_Server
|
||||
Section $(TITLE_Flectra_Server) SectionFlectra_Server
|
||||
SectionIn 1 2
|
||||
|
||||
# Installing winpython
|
||||
@@ -228,7 +228,7 @@ Section $(TITLE_Odoo_Server) SectionOdoo_Server
|
||||
SetOutPath "$INSTDIR\thirdparty"
|
||||
File /r "${STATIC_PATH}\wkhtmltopdf\*"
|
||||
|
||||
# If there is a previous install of the Odoo Server, keep the login/password from the config file
|
||||
# If there is a previous install of the Flectra Server, keep the login/password from the config file
|
||||
WriteIniStr "$INSTDIR\server\flectra.conf" "options" "db_host" $TextPostgreSQLHostname
|
||||
WriteIniStr "$INSTDIR\server\flectra.conf" "options" "db_user" $TextPostgreSQLUsername
|
||||
WriteIniStr "$INSTDIR\server\flectra.conf" "options" "db_password" $TextPostgreSQLPassword
|
||||
@@ -290,7 +290,7 @@ Section $(TITLE_PostgreSQL) SectionPostgreSQL
|
||||
--mode unattended \
|
||||
--prefix "$INSTDIR\PostgreSQL" \
|
||||
--datadir "$INSTDIR\PostgreSQL\data" \
|
||||
--servicename "PostgreSQL_For_Odoo" \
|
||||
--servicename "PostgreSQL_For_Flectra" \
|
||||
--serviceaccount "openpgsvc" --servicepassword "0p3npgsvcPWD" \
|
||||
--superaccount "$TextPostgreSQLUsername" --superpassword "$TextPostgreSQLPassword" \
|
||||
--serverport $TextPostgreSQLPort'
|
||||
@@ -312,7 +312,7 @@ Section -Post
|
||||
SectionEnd
|
||||
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SectionOdoo_Server} $(DESC_Odoo_Server)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SectionFlectra_Server} $(DESC_Flectra_Server)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SectionPostgreSQL} $(DESC_PostgreSQL)
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
@@ -342,9 +342,9 @@ Function .onInit
|
||||
ReadRegStr $previous_install_dir HKLM "${REGISTRY_KEY}" "Install_Dir"
|
||||
${If} $previous_install_dir == ""
|
||||
${If} ${RunningX64}
|
||||
StrCpy $INSTDIR "$PROGRAMFILES64\Odoo ${VERSION}"
|
||||
StrCpy $INSTDIR "$PROGRAMFILES64\Flectra ${VERSION}"
|
||||
${Else}
|
||||
StrCpy $INSTDIR "$PROGRAMFILES\Odoo ${VERSION}"
|
||||
StrCpy $INSTDIR "$PROGRAMFILES\Flectra ${VERSION}"
|
||||
${EndIf}
|
||||
WriteRegStr HKLM "${REGISTRY_KEY}" "Install_dir" "$INSTDIR"
|
||||
${EndIf}
|
||||
@@ -399,7 +399,7 @@ Function PostgreSQLOnBack
|
||||
FunctionEnd
|
||||
|
||||
Function ShowPostgreSQL
|
||||
SectionGetFlags ${SectionOdoo_Server} $0
|
||||
SectionGetFlags ${SectionFlectra_Server} $0
|
||||
IntOp $0 $0 & ${SF_SELECTED}
|
||||
IntCmp $0 ${SF_SELECTED} LaunchPostgreSQLConfiguration
|
||||
Abort
|
||||
@@ -470,7 +470,7 @@ Function LeavePostgreSQL
|
||||
FunctionEnd
|
||||
|
||||
Function ComponentLeave
|
||||
SectionGetFlags ${SectionOdoo_Server} $0
|
||||
SectionGetFlags ${SectionFlectra_Server} $0
|
||||
IntOp $0 $0 & ${SF_SELECTED}
|
||||
IntCmp $0 ${SF_SELECTED} Done
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
For copyright information, please see the COPYRIGHT file.
|
||||
|
||||
Odoo is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3
|
||||
Flectra is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3
|
||||
(LGPLv3), as included below. Since the LGPL is a set of additional
|
||||
permissions on top of the GPL, the text of the GPL is included at the
|
||||
bottom as well.
|
||||
|
||||
Some external libraries and contributions bundled with Odoo may be published
|
||||
Some external libraries and contributions bundled with Flectra may be published
|
||||
under other GPL-compatible licenses. For these, please refer to the relevant
|
||||
source files and/or license files, in the source code tree.
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ For copyright information, please see the COPYRIGHT file.\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
Odoo is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3\u13\'0d}
|
||||
Flectra is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
(LGPLv3), as included below. Since the LGPL is a set of additional\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
@@ -29,7 +29,7 @@ bottom as well.\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
Some external libraries and contributions bundled with Odoo may be published\u13\'0d}
|
||||
Some external libraries and contributions bundled with Flectra may be published\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
under other GPL-compatible licenses. For these, please refer to the relevant\u13\'0d}
|
||||
\par \pard\plain \s0\ql\nowidctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf1\kerning1\dbch\af7\langfe2052\dbch\af11\afs24\alang1081\loch\f5\fs24\lang1033{\rtlch \ltrch\loch
|
||||
|
||||
Reference in New Issue
Block a user