diff --git a/software/slapos-windows-installer/instance.cfg.in b/software/slapos-windows-installer/instance.cfg.in index 0e3fa776939245a564fc65a36036c1dab52a9581..b1480e975658a538be25079c95f903f652c1345f 100644 --- a/software/slapos-windows-installer/instance.cfg.in +++ b/software/slapos-windows-installer/instance.cfg.in @@ -16,6 +16,12 @@ configure-options = TARGETDIR=$${buildout:directory} /quiet /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 -post-install = - $${buildout:directory}/cygwin/etc/slapos/scripts/slapos-configure.sh +post-install = + $${buildout:directory}/slapos-windows-wrapper.bat slapos-configure slaproot diff --git a/software/slapos-windows-installer/software.cfg b/software/slapos-windows-installer/software.cfg index f37287aca0efa4a0c214291fae93e1e414cf9971..be223a5f7055c279f189b600dacca768286bec91 100644 --- a/software/slapos-windows-installer/software.cfg +++ b/software/slapos-windows-installer/software.cfg @@ -9,7 +9,7 @@ parts = [inno-setup] 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 download-only = true @@ -19,10 +19,10 @@ url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/win md5sum = 6fc482120dc41d230dc360ea56344fea download-only = true -[slapos-build-installer.bat] +[slapos-windows-wrapper.bat] recipe = hexagonit.recipe.download -url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-build-installer.bat -md5sum = 5f9a3880efdec2c1e53e0f4d1f960146 +url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-windows-wrapper.bat +md5sum = 5ab0a8f6a1de35d8de5ad616aeca9fcd download-only = true [setup-cygwin] @@ -34,6 +34,7 @@ download-only = true [cygwin-packages] recipe = hexagonit.recipe.download url = http://dashingsoft.com/products/slapos/cygwin-packages.tar.bz2 +url = /cygdrive/d/slapos/cygwin-packages.tar.bz2 md5sum = b0e3f3cf51573c3c94c787201fbb8cdf download-only = true @@ -47,12 +48,12 @@ pre-configure= (cd ${:cygroot} ; tar xjf ${cygwin-packages:location}/cygwin-packages.tar.bz2) cp /usr/bin/setup.exe ${:cygroot} 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} chmod +x ${:cygroot}/*.bat configure-command = ${:cygroot}/setup-cygwin.bat make-binary = true -post-install= ${:cygroot}/slapos-build-installer.bat +post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer #---------------- #-- Instance-level buildout profiles.