mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-08-19 01:34:43 -05:00
[FIX] package building rename
This commit is contained in:
Flectra
+2
-2
@@ -2,7 +2,7 @@
|
||||
|
||||
# set server timezone in UTC before time module imported
|
||||
__import__('os').environ['TZ'] = 'UTC'
|
||||
import odoo
|
||||
import flectra
|
||||
|
||||
if __name__ == "__main__":
|
||||
odoo.cli.main()
|
||||
flectra.cli.main()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Please note that this Dockerfile is used for testing nightly builds and should
|
||||
# not be used to deploy Odoo
|
||||
# not be used to deploy Flectra
|
||||
FROM debian:stretch
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
MAINTAINER FlectraHQ <info@flectrahq.com>
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y locales && \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Please note that this Dockerfile is used for testing nightly builds and should
|
||||
# not be used to deploy Odoo
|
||||
# not be used to deploy FlectraHQ
|
||||
FROM fedora:26
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
MAINTAINER FlectraHQ <info@flectrahq.com>
|
||||
|
||||
# Dependencies and postgres
|
||||
RUN dnf update -d 0 -e 0 -y && \
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
# Please note that this Dockerfile is used for testing nightly builds and should
|
||||
# not be used to deploy Odoo
|
||||
# not be used to deploy FlectraHQ
|
||||
FROM debian:stretch
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
MAINTAINER FlectraHQ <info@flectrahq.com>
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y locales && \
|
||||
|
||||
+5
-5
@@ -174,7 +174,7 @@ def docker(docker_image, build_dir, pub_dir):
|
||||
_docker.end()
|
||||
|
||||
class KVM(object):
|
||||
def __init__(self, o, image, ssh_key='', login='openerp'):
|
||||
def __init__(self, o, image, ssh_key='', login='flectra'):
|
||||
self.o = o
|
||||
self.image = image
|
||||
self.ssh_key = ssh_key
|
||||
@@ -233,9 +233,9 @@ class KVMWinBuildExe(KVM):
|
||||
|
||||
class KVMWinTestExe(KVM):
|
||||
def run(self):
|
||||
setuppath = glob("%s/openerp-server-setup-*.exe" % self.o.build_dir)[0]
|
||||
setuppath = glob("%s/flectra-server-setup-*.exe" % self.o.build_dir)[0]
|
||||
setupfile = setuppath.split('/')[-1]
|
||||
setupversion = setupfile.split('openerp-server-setup-')[1].split('.exe')[0]
|
||||
setupversion = setupfile.split('flectra-server-setup-')[1].split('.exe')[0]
|
||||
|
||||
self.rsync('"%s" %s@127.0.0.1:' % (setuppath, self.login))
|
||||
self.ssh("TEMP=/tmp ./%s /S" % setupfile)
|
||||
@@ -299,7 +299,7 @@ def build_rpm(o):
|
||||
|
||||
def build_exe(o):
|
||||
KVMWinBuildExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_winxp_login).start()
|
||||
system(['cp', glob('%s/openerp*.exe' % o.build_dir)[0], '%s/flectra_%s.%s.exe' % (o.build_dir, version, timestamp)])
|
||||
system(['cp', glob('%s/flectra*.exe' % o.build_dir)[0], '%s/flectra_%s.%s.exe' % (o.build_dir, version, timestamp)])
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Stage: testing
|
||||
@@ -467,7 +467,7 @@ def options():
|
||||
# derive other options
|
||||
o.flectra_dir = root
|
||||
o.pkg = join(o.build_dir, 'pkg')
|
||||
o.work = join(o.build_dir, 'openerp-%s' % version)
|
||||
o.work = join(o.build_dir, 'flectra-%s' % version)
|
||||
o.work_addons = join(o.work, 'flectra', 'addons')
|
||||
|
||||
return o
|
||||
|
||||
+29
-29
@@ -2,58 +2,58 @@
|
||||
|
||||
set -e
|
||||
|
||||
ODOO_CONFIGURATION_DIR=/etc/odoo
|
||||
ODOO_CONFIGURATION_FILE=$ODOO_CONFIGURATION_DIR/odoo.conf
|
||||
ODOO_DATA_DIR=/var/lib/odoo
|
||||
ODOO_GROUP="odoo"
|
||||
ODOO_LOG_DIR=/var/log/odoo
|
||||
ODOO_LOG_FILE=$ODOO_LOG_DIR/odoo-server.log
|
||||
ODOO_USER="odoo"
|
||||
FLECTRA_CONFIGURATION_DIR=/etc/flectra
|
||||
FLECTRA_CONFIGURATION_FILE=$FLECTRA_CONFIGURATION_DIR/flectra.conf
|
||||
FLECTRA_DATA_DIR=/var/lib/flectra
|
||||
FLECTRA_GROUP="flectra"
|
||||
FLECTRA_LOG_DIR=/var/log/flectra
|
||||
FLECTRA_LOG_FILE=$FLECTRA_LOG_DIR/flectra-server.log
|
||||
FLECTRA_USER="flectra"
|
||||
|
||||
if ! getent passwd | grep -q "^odoo:"; then
|
||||
groupadd $ODOO_GROUP
|
||||
adduser --system --no-create-home $ODOO_USER -g $ODOO_GROUP
|
||||
if ! getent passwd | grep -q "^flectra:"; then
|
||||
groupadd $FLECTRA_GROUP
|
||||
adduser --system --no-create-home $FLECTRA_USER -g $FLECTRA_GROUP
|
||||
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
|
||||
mkdir -p $ODOO_CONFIGURATION_DIR
|
||||
mkdir -p $FLECTRA_CONFIGURATION_DIR
|
||||
# can't copy debian config-file as addons_path is not the same
|
||||
if [ ! -f $ODOO_CONFIGURATION_FILE ]
|
||||
if [ ! -f $FLECTRA_CONFIGURATION_FILE ]
|
||||
then
|
||||
echo "[options]
|
||||
; This is the password that allows database operations:
|
||||
; admin_passwd = admin
|
||||
db_host = False
|
||||
db_port = False
|
||||
db_user = $ODOO_USER
|
||||
db_user = $FLECTRA_USER
|
||||
db_password = False
|
||||
addons_path = /usr/lib/python3.6/site-packages/odoo/addons
|
||||
" > $ODOO_CONFIGURATION_FILE
|
||||
chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
|
||||
chmod 0640 $ODOO_CONFIGURATION_FILE
|
||||
addons_path = /usr/lib/python3.6/site-packages/flectra/addons
|
||||
" > $FLECTRA_CONFIGURATION_FILE
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_CONFIGURATION_FILE
|
||||
chmod 0640 $FLECTRA_CONFIGURATION_FILE
|
||||
fi
|
||||
# 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
|
||||
mkdir -p $ODOO_DATA_DIR
|
||||
chown $ODOO_USER:$ODOO_GROUP $ODOO_DATA_DIR
|
||||
mkdir -p $FLECTRA_DATA_DIR
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_DATA_DIR
|
||||
|
||||
INIT_FILE=/lib/systemd/system/odoo.service
|
||||
INIT_FILE=/lib/systemd/system/flectra.service
|
||||
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]
|
||||
Type=simple
|
||||
User=odoo
|
||||
Group=odoo
|
||||
ExecStart=/usr/bin/odoo --config $ODOO_CONFIGURATION_FILE --logfile $ODOO_LOG_FILE
|
||||
User=flectra
|
||||
Group=flectra
|
||||
ExecStart=/usr/bin/flectra --config $FLECTRA_CONFIGURATION_FILE --logfile $FLECTRA_LOG_FILE
|
||||
KillMode=mixed
|
||||
|
||||
[Install]
|
||||
|
||||
@@ -31,4 +31,4 @@ allinone: server_clean
|
||||
#(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE))
|
||||
(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_MAKENSIS))
|
||||
(cd $(SERVER_DIRECTORY)/setup/win32 && mkdir -p $(FILES_DIRECTORY))
|
||||
(cd $(SERVER_DIRECTORY)/setup/win32 && cp openerp-*.exe $(FILES_DIRECTORY)/openerp-server-setup-$(VERSION).exe)
|
||||
(cd $(SERVER_DIRECTORY)/setup/win32 && cp flectra-*.exe $(FILES_DIRECTORY)/flectra-server-setup-$(VERSION).exe)
|
||||
|
||||
+47
-47
@@ -1,4 +1,4 @@
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
# Part of Odoo,Flectra. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
# TODO: Avoid to uninstall the database
|
||||
# TODO: We can update the server or the clients without to uninstall the all-in-one
|
||||
@@ -38,10 +38,10 @@
|
||||
Exch $R2
|
||||
!macroend
|
||||
|
||||
!define PUBLISHER 'Odoo S.A.'
|
||||
!define PUBLISHER 'FlectraHQ'
|
||||
|
||||
!ifndef MAJOR_VERSION
|
||||
!define MAJOR_VERSION '11'
|
||||
!define MAJOR_VERSION '1'
|
||||
!endif
|
||||
|
||||
!ifndef MINOR_VERSION
|
||||
@@ -57,14 +57,14 @@
|
||||
#!define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-r${REVISION_VERSION}"
|
||||
!endif
|
||||
|
||||
!define PRODUCT_NAME "Odoo"
|
||||
!define PRODUCT_NAME "Flectra"
|
||||
!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}\Odoo Server ${VERSION}"
|
||||
!define UNINSTALL_REGISTRY_KEY_SERVER "${UNINSTALL_BASE_REGISTRY_KEY}\Flectra Server ${VERSION}"
|
||||
|
||||
!define REGISTRY_KEY "Software\${DISPLAY_NAME}"
|
||||
|
||||
@@ -75,14 +75,14 @@
|
||||
|
||||
Name '${DISPLAY_NAME}'
|
||||
Caption "${PRODUCT_NAME} ${VERSION} Setup"
|
||||
OutFile "openerp-allinone-setup-${VERSION}.exe"
|
||||
OutFile "flectra-allinone-setup-${VERSION}.exe"
|
||||
SetCompressor /FINAL lzma
|
||||
#SetCompress auto
|
||||
ShowInstDetails show
|
||||
|
||||
#XPStyle on
|
||||
|
||||
InstallDir "$PROGRAMFILES\Odoo ${VERSION}"
|
||||
InstallDir "$PROGRAMFILES\Flectra ${VERSION}"
|
||||
InstallDirRegKey HKCU "${REGISTRY_KEY}" ""
|
||||
|
||||
BrandingText '${PRODUCT_NAME} ${VERSION}'
|
||||
@@ -93,7 +93,7 @@ RequestExecutionLevel admin
|
||||
#VIAddVersionKey "CompanyName" "${PUBLISHER}"
|
||||
#VIAddVersionKey "FileDescription" "Installer of ${DISPLAY_NAME}"
|
||||
#VIAddVersionKey "LegalCopyright" "${PUBLISHER}"
|
||||
#VIAddVersionKey "LegalTrademark" "OpenERP is a trademark of ${PUBLISHER}"
|
||||
#VIAddVersionKey "LegalTrademark" "FLECTRA is a trademark of ${PUBLISHER}"
|
||||
#VIAddVersionKey "FileVersion" "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"
|
||||
#VIProductVersion "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"
|
||||
|
||||
@@ -120,12 +120,12 @@ Var HWNDPostgreSQLPassword
|
||||
!define POSTGRESQL_EXE "${STATIC_PATH}\${POSTGRESQL_EXE_FILENAME}"
|
||||
|
||||
!define MUI_ABORTWARNING
|
||||
!define MUI_ICON "${PIXMAPS_PATH}\openerp-icon.ico"
|
||||
!define MUI_ICON "${PIXMAPS_PATH}\flectra-icon.ico"
|
||||
|
||||
!define MUI_WELCOMEFINISHPAGE_BITMAP "${PIXMAPS_PATH}\openerp-intro.bmp"
|
||||
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${PIXMAPS_PATH}\openerp-intro.bmp"
|
||||
!define MUI_WELCOMEFINISHPAGE_BITMAP "${PIXMAPS_PATH}\flectra-intro.bmp"
|
||||
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${PIXMAPS_PATH}\flectra-intro.bmp"
|
||||
!define MUI_HEADERIMAGE
|
||||
!define MUI_HEADERIMAGE_BITMAP "${PIXMAPS_PATH}\openerp-slogan.bmp"
|
||||
!define MUI_HEADERIMAGE_BITMAP "${PIXMAPS_PATH}\flectra-slogan.bmp"
|
||||
!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
|
||||
!define MUI_HEADER_TRANSPARENT_TEXT ""
|
||||
|
||||
@@ -144,7 +144,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 "https://www.odoo.com/page/contactus"
|
||||
!define MUI_FINISHPAGE_LINK_LOCATION "https://flectrahq.com/page/contactus"
|
||||
!insertmacro MUI_PAGE_FINISH
|
||||
|
||||
!insertmacro MUI_UNPAGE_WELCOME
|
||||
@@ -157,11 +157,11 @@ Page Custom ShowPostgreSQL LeavePostgreSQL
|
||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||
|
||||
; English
|
||||
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_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"
|
||||
@@ -173,16 +173,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} "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_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_FLECTRA_Server ${LANG_FRENCH} "Installation du Serveur Flectra avec tous les modules Flectra 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"
|
||||
@@ -194,14 +194,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_OpenERP_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_OpenERP_Server) SectionOpenERP_Server
|
||||
Section $(TITLE_FLECTRA_Server) SectionFLECTRA_Server
|
||||
SectionIn 1 2
|
||||
|
||||
# TODO: install in a temp dir before
|
||||
@@ -231,31 +231,31 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
|
||||
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\odoo.conf" "options" "db_host" $TextPostgreSQLHostname
|
||||
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_user" $TextPostgreSQLUsername
|
||||
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_password" $TextPostgreSQLPassword
|
||||
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_port" $TextPostgreSQLPort
|
||||
# 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
|
||||
WriteIniStr "$INSTDIR\server\flectra.conf" "options" "db_port" $TextPostgreSQLPort
|
||||
# Fix the addons path
|
||||
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "addons_path" "$INSTDIR\server\odoo\addons"
|
||||
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "bin_path" "$INSTDIR\thirdparty"
|
||||
WriteIniStr "$INSTDIR\server\flectra.conf" "options" "addons_path" "$INSTDIR\server\flectra\addons"
|
||||
WriteIniStr "$INSTDIR\server\flectra.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
|
||||
${If} $HasPostgreSQL == 0
|
||||
WriteIniStr "$INSTDIR\server\odoo.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
|
||||
WriteIniStr "$INSTDIR\server\flectra.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
|
||||
${EndIf}
|
||||
|
||||
DetailPrint "Installing Windows service"
|
||||
nsExec::ExecTOLog '"$INSTDIR\python\python.exe" "$INSTDIR\server\odoo-bin" --stop-after-init --logfile "$INSTDIR\server\odoo.log" -s'
|
||||
nsExec::ExecTOLog '"$INSTDIR\python\python.exe" "$INSTDIR\server\flectra-bin" --stop-after-init --logfile "$INSTDIR\server\flectra.log" -s'
|
||||
${If} ${RunningX64}
|
||||
nsExec::ExecToLog '"$INSTDIR\nssm\win64\nssm.exe" install ${SERVICENAME} "$INSTDIR\python\python.exe" "\"$INSTDIR\server\odoo-bin\""'
|
||||
nsExec::ExecToLog '"$INSTDIR\nssm\win64\nssm.exe" install ${SERVICENAME} "$INSTDIR\python\python.exe" "\"$INSTDIR\server\flectra-bin\""'
|
||||
nsExec::ExecToLog '"$INSTDIR\nssm\win64\nssm.exe" set ${SERVICENAME} AppDirectory "$\"$INSTDIR\server$\""'
|
||||
${Else}
|
||||
nsExec::ExecToLog '"$INSTDIR\nssm\win32\nssm.exe" install ${SERVICENAME} "$INSTDIR\python\python.exe" "\"$INSTDIR\server\odoo-bin\""'
|
||||
nsExec::ExecToLog '"$INSTDIR\nssm\win32\nssm.exe" install ${SERVICENAME} "$INSTDIR\python\python.exe" "\"$INSTDIR\server\flectra-bin\""'
|
||||
nsExec::ExecToLog '"$INSTDIR\nssm\win32\nssm.exe" set ${SERVICENAME} AppDirectory "$\"$INSTDIR\server$\""'
|
||||
${EndIf}
|
||||
|
||||
|
||||
nsExec::Exec "net stop ${SERVICENAME}"
|
||||
sleep 2
|
||||
|
||||
@@ -282,7 +282,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'
|
||||
@@ -297,17 +297,17 @@ 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@odoo.com"
|
||||
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+32.81.81.37.00"
|
||||
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "https://www.odoo.com"
|
||||
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@odoo.com"
|
||||
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@flectrahq.com"
|
||||
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+65.00.00.00.00"
|
||||
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "https://flectrahq.com"
|
||||
WriteRegStr HKLM "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@flectrahq.com"
|
||||
WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"
|
||||
WriteRegDWORD HKLM "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"
|
||||
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
||||
SectionEnd
|
||||
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SectionOpenERP_Server} $(DESC_OpenERP_Server)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SectionFLECTRA_Server} $(DESC_FLECTRA_Server)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SectionPostgreSQL} $(DESC_PostgreSQL)
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
@@ -383,7 +383,7 @@ Function PostgreSQLOnBack
|
||||
FunctionEnd
|
||||
|
||||
Function ShowPostgreSQL
|
||||
SectionGetFlags ${SectionOpenERP_Server} $0
|
||||
SectionGetFlags ${SectionFLECTRA_Server} $0
|
||||
IntOp $0 $0 & ${SF_SELECTED}
|
||||
IntCmp $0 ${SF_SELECTED} LaunchPostgreSQLConfiguration
|
||||
Abort
|
||||
@@ -454,7 +454,7 @@ Function LeavePostgreSQL
|
||||
FunctionEnd
|
||||
|
||||
Function ComponentLeave
|
||||
SectionGetFlags ${SectionOpenERP_Server} $0
|
||||
SectionGetFlags ${SectionFLECTRA_Server} $0
|
||||
IntOp $0 $0 & ${SF_SELECTED}
|
||||
IntCmp $0 ${SF_SELECTED} Done
|
||||
|
||||
@@ -473,5 +473,5 @@ Function ComponentLeave
|
||||
FunctionEnd
|
||||
|
||||
Function LaunchLink
|
||||
ExecShell "open" "http://localhost:8069/"
|
||||
ExecShell "open" "http://localhost:7073/"
|
||||
FunctionEnd
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
set -e
|
||||
|
||||
mkdir -p wkhtmltopdf less
|
||||
TEMPDIR=`mktemp -d -t odoo_windows_build_XXXX`
|
||||
TEMPDIR=`mktemp -d -t flectra_windows_build_XXXX`
|
||||
function cleanup {
|
||||
rm -rf $TEMPDIR
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user