Commit ffeb6aa9 authored by Jondy Zhao's avatar Jondy Zhao

slapos-windows-installer:

  use slapos-windows-wrapper.bat to run build script
parent 3fd68412
...@@ -16,6 +16,12 @@ configure-options = ...@@ -16,6 +16,12 @@ configure-options =
TARGETDIR=$${buildout:directory} TARGETDIR=$${buildout:directory}
/quiet /quiet
/log $${buildout:directory}/slapos-windows-installer.log /log $${buildout:directory}/slapos-windows-installer.log
pre-install =
cp ${installer:cygroot}/slapos-windows-wrapper.bat $${buildout:directory}/
cp ${installer:cygroot}/cygwin/etc/opt/slapos/ssl/computer.key $${buildout:directory}/cygwin/
cp ${installer:cygroot}/cygwin/etc/opt/slapos/ssl/computer.crt $${buildout:directory}/cygwin/
cp ~/.slapos/key $${buildout:directory}/cygwin/
cp ~/.slapos/certificate $${buildout:directory}/cygwin/
make-binary = true make-binary = true
post-install = post-install =
$${buildout:directory}/cygwin/etc/slapos/scripts/slapos-configure.sh $${buildout:directory}/slapos-windows-wrapper.bat slapos-configure slaproot
...@@ -9,7 +9,7 @@ parts = ...@@ -9,7 +9,7 @@ parts =
[inno-setup] [inno-setup]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = http://dashingsoft.com/products/slapos/inno-setup.tar.gz url = http://dashingsoft.com/products/slapos/inno-setup.tar.bz2
md5sum = 44620b8619c9cc5b3e262655f0089f05 md5sum = 44620b8619c9cc5b3e262655f0089f05
download-only = true download-only = true
...@@ -19,10 +19,10 @@ url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/win ...@@ -19,10 +19,10 @@ url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/win
md5sum = 6fc482120dc41d230dc360ea56344fea md5sum = 6fc482120dc41d230dc360ea56344fea
download-only = true download-only = true
[slapos-build-installer.bat] [slapos-windows-wrapper.bat]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-build-installer.bat url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-windows-wrapper.bat
md5sum = 5f9a3880efdec2c1e53e0f4d1f960146 md5sum = 5ab0a8f6a1de35d8de5ad616aeca9fcd
download-only = true download-only = true
[setup-cygwin] [setup-cygwin]
...@@ -34,6 +34,7 @@ download-only = true ...@@ -34,6 +34,7 @@ download-only = true
[cygwin-packages] [cygwin-packages]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = http://dashingsoft.com/products/slapos/cygwin-packages.tar.bz2 url = http://dashingsoft.com/products/slapos/cygwin-packages.tar.bz2
url = /cygdrive/d/slapos/cygwin-packages.tar.bz2
md5sum = b0e3f3cf51573c3c94c787201fbb8cdf md5sum = b0e3f3cf51573c3c94c787201fbb8cdf
download-only = true download-only = true
...@@ -47,12 +48,12 @@ pre-configure= ...@@ -47,12 +48,12 @@ pre-configure=
(cd ${:cygroot} ; tar xjf ${cygwin-packages:location}/cygwin-packages.tar.bz2) (cd ${:cygroot} ; tar xjf ${cygwin-packages:location}/cygwin-packages.tar.bz2)
cp /usr/bin/setup.exe ${:cygroot} cp /usr/bin/setup.exe ${:cygroot}
cp ${slapos-build-installer:location}/slapos-build-installer ${:cygroot}/cygwin cp ${slapos-build-installer:location}/slapos-build-installer ${:cygroot}/cygwin
cp ${slapos-build-installer.bat:location}/slapos-build-installer.bat ${:cygroot} cp ${slapos-windows-wrapper.bat:location}/slapos-windows-wrapper.bat ${:cygroot}
cp ${setup-cygwin:location}/setup-cygwin.bat ${:cygroot} cp ${setup-cygwin:location}/setup-cygwin.bat ${:cygroot}
chmod +x ${:cygroot}/*.bat chmod +x ${:cygroot}/*.bat
configure-command = ${:cygroot}/setup-cygwin.bat configure-command = ${:cygroot}/setup-cygwin.bat
make-binary = true make-binary = true
post-install= ${:cygroot}/slapos-build-installer.bat post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer
#---------------- #----------------
#-- Instance-level buildout profiles. #-- Instance-level buildout profiles.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment