summaryrefslogtreecommitdiff
path: root/setup/win32
diff options
context:
space:
mode:
Diffstat (limited to 'setup/win32')
-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
7 files changed, 34 insertions, 1 deletions
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