Commit 3fd68412 authored by Jondy Zhao's avatar Jondy Zhao

slapos-windows-installer: fix running problem

parent e3be1151
...@@ -9,7 +9,7 @@ offline = true ...@@ -9,7 +9,7 @@ offline = true
[slapos-instance] [slapos-instance]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
# This url is useless # This url is useless
url = /usr/bin/true.exe path = $${buildout:directory}
configure-command = msiexec.exe configure-command = msiexec.exe
configure-options = configure-options =
/i ${installer:location}/slapos-windows-all-in-one.exe /i ${installer:location}/slapos-windows-all-in-one.exe
......
...@@ -4,9 +4,6 @@ extends = ...@@ -4,9 +4,6 @@ extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
parts = parts =
setup-cygwin
slapos-build-installer
inno-setup
installer installer
instance-template instance-template
...@@ -19,28 +16,43 @@ download-only = true ...@@ -19,28 +16,43 @@ download-only = true
[slapos-build-installer] [slapos-build-installer]
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 url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-build-installer
md5sum = 217066b8a5bda72e52d97b04461bd9f1 md5sum = 6fc482120dc41d230dc360ea56344fea
download-only = true download-only = true
[setup-cgywin] [slapos-build-installer.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
download-only = true
[setup-cygwin]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/setup-cygwin.bat url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/setup-cygwin.bat
md5sum = 5ec4f11eee39230a38ef3d2ba59fde44 md5sum = eb868bed0d0fd9d950f4f972b09a2479
download-only = true
[cygwin-packages]
recipe = hexagonit.recipe.download
url = http://dashingsoft.com/products/slapos/cygwin-packages.tar.bz2
md5sum = b0e3f3cf51573c3c94c787201fbb8cdf
download-only = true download-only = true
[installer] [installer]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://dashingsoft.com/products/slapos/cygwin-packages.tar.gz path = ${buildout:parts-directory}/${:_buildout_section_name_}
cygroot = ${buildout:parts-directory}/${:_buildout_section_name_}
pre-configure= pre-configure=
mkdir -p ${:location}/cygwin mkdir -p ${:cygroot}/cygwin
(cd ${:location}/cygwin ; tar xzf ${inno-setup:location}/inno-setup.tar.gz) (cd ${:cygroot}/cygwin ; tar xzf ${inno-setup:location}/inno-setup.tar.gz)
cp /usr/bin/setup.exe ${:location} (cd ${:cygroot} ; tar xjf ${cygwin-packages:location}/cygwin-packages.tar.bz2)
cp ${setup-cygwin}/setup-cygwin.bat ${:location}/cygwin cp /usr/bin/setup.exe ${:cygroot}
cp ${slapos-build-installer}/slapos-build-installer ${:location}/cygwin cp ${slapos-build-installer:location}/slapos-build-installer ${:cygroot}/cygwin
configure-command = ${buildout:directory}/setup-cygwin.bat cp ${slapos-build-installer.bat:location}/slapos-build-installer.bat ${:cygroot}
make-binary = ${:location}/cygwin/bin/bash --login /slapos-build-installer cp ${setup-cygwin:location}/setup-cygwin.bat ${:cygroot}
make-options = chmod +x ${:cygroot}/*.bat
--inno-setup=/inno-setup/ISCC.exe configure-command = ${:cygroot}/setup-cygwin.bat
make-binary = true
post-install= ${:cygroot}/slapos-build-installer.bat
#---------------- #----------------
#-- 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