Skip to content

Commit 648a26f

Browse files
author
Mischa Taylor
committed
Adding Parallels support for Win8.1 images
1 parent 3067e6e commit 648a26f

25 files changed

+512
-115
lines changed

‎Makefile

+31-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ifdef PACKER_DEBUG
8888
PACKER := PACKER_LOG=1 $(PACKER) --debug
8989
else
9090
endif
91-
BUILDER_TYPES ?= vmware virtualbox
91+
BUILDER_TYPES ?= vmware virtualbox parallels
9292
ifeq ($(OS),Windows_NT)
9393
VAGRANT_PROVIDER ?= vmware_workstation
9494
else
@@ -99,13 +99,17 @@ BOX_FILENAMES := $(TEMPLATE_FILENAMES:.json=$(BOX_SUFFIX))
9999
TEST_BOX_FILES := $(foreach builder, $(BUILDER_TYPES), $(foreach box_filename, $(BOX_FILENAMES), test-box/$(builder)/$(box_filename)))
100100
VMWARE_BOX_DIR := box/vmware
101101
VIRTUALBOX_BOX_DIR := box/virtualbox
102+
PARALLELS_BOX_DIR := box/parallels
102103
VMWARE_BOX_FILES := $(foreach box_filename, $(BOX_FILENAMES), $(VMWARE_BOX_DIR)/$(box_filename))
103104
VIRTUALBOX_BOX_FILES := $(foreach box_filename, $(BOX_FILENAMES), $(VIRTUALBOX_BOX_DIR)/$(box_filename))
105+
PARALLELS_BOX_FILES := $(foreach box_filename, $(BOX_FILENAMES), $(PARALLELS_BOX_DIR)/$(box_filename))
104106
BOX_FILES := $(foreach builder, $(BUILDER_TYPES), $(foreach box_filename, $(BOX_FILENAMES), box/$(builder)/$(box_filename)))
105107
VMWARE_OUTPUT := output-vmware-iso
106108
VIRTUALBOX_OUTPUT := output-virtualbox-iso
109+
PARALLELS_OUTPUT := output-parallels-iso
107110
VMWARE_BUILDER := vmware-iso
108111
VIRTUALBOX_BUILDER := virtualbox-iso
112+
PARALLELS_BUILDER := parallels-iso
109113
CURRENT_DIR := $(shell pwd)
110114
UNAME_O := $(shell uname -o 2> /dev/null)
111115
ifeq ($(UNAME_O),Cygwin)
@@ -140,6 +144,10 @@ virtualbox/$(1): $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX)
140144

141145
virtualbox/$(1)-cygwin: $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
142146

147+
parallels/$(1): $(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX)
148+
149+
parallels/$(1)-cygwin: $(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
150+
143151
test-vmware/$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX)
144152

145153
test-vmware/$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
@@ -148,6 +156,10 @@ test-virtualbox/$(1): test-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX)
148156

149157
test-virtualbox/$(1)-cygwin: test-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
150158

159+
test-parallels/$(1): test-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX)
160+
161+
test-parallels/$(1)-cygwin: test-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
162+
151163
ssh-vmware/$(1): ssh-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX)
152164

153165
ssh-vmware/$(1)-cygwin: ssh-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
@@ -156,12 +168,17 @@ ssh-virtualbox/$(1): ssh-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX)
156168

157169
ssh-virtualbox/$(1)-cygwin: ssh-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
158170

171+
ssh-parallels/$(1): ssh-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX)
172+
173+
ssh-parallels/$(1)-cygwin: ssh-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX)
174+
159175
s3cp-$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX)
160176

161177
s3cp-vmware/$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX)
162178

163179
s3cp-virtualbox/$(1): s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX)
164180

181+
s3cp-parallels/$(1): s3cp-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX)
165182
endef
166183

167184
SHORTCUT_TARGETS := $(basename $(TEMPLATE_FILENAMES))
@@ -366,7 +383,7 @@ list:
366383
@echo "To build for all target platforms:"
367384
@echo " make win7x64-pro"
368385
@echo ""
369-
@echo "Prepend 'vmware/' or 'virtualbox/' to build only one target platform:"
386+
@echo "Prepend 'vmware/' or 'virtualbox/' or 'parallels/' to build only one target platform:"
370387
@echo " make vmware/win7x64-pro"
371388
@echo ""
372389
@echo "Append '-cygwin' to use Cygwin's SSH instead of OpenSSH:"
@@ -414,6 +431,10 @@ test-$(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX): $(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX)
414431
-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
415432
bin/test-box.sh $< virtualbox virtualbox $(CURRENT_DIR)/test/*_spec.rb
416433

434+
test-$(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX): $(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX)
435+
-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
436+
bin/test-box.sh $< parallels parallels $(CURRENT_DIR)/test/*_spec.rb
437+
417438
ssh-$(VMWARE_BOX_DIR)/%$(BOX_SUFFIX): $(VMWARE_BOX_DIR)/%$(BOX_SUFFIX)
418439
-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
419440
bin/ssh-box.sh $< vmware_desktop $(VAGRANT_PROVIDER) $(CURRENT_DIR)/test/*_spec.rb
@@ -422,6 +443,10 @@ ssh-$(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX): $(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX)
422443
-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
423444
bin/ssh-box.sh $< virtualbox virtualbox $(CURRENT_DIR)/test/*_spec.rb
424445

446+
ssh-$(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX): $(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX)
447+
-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
448+
bin/ssh-box.sh $< parallels parallels $(CURRENT_DIR)/test/*_spec.rb
449+
425450
S3_STORAGE_CLASS ?= REDUCED_REDUNDANCY
426451
S3_ALLUSERS_ID ?= uri=http://acs.amazonaws.com/groups/global/AllUsers
427452

@@ -431,5 +456,9 @@ s3cp-$(VMWARE_BOX_DIR)/%$(BOX_SUFFIX): $(VMWARE_BOX_DIR)/%$(BOX_SUFFIX)
431456
s3cp-$(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX): $(VIRTUALBOX_BOX_DIR)/%$(BOX_SUFFIX)
432457
aws s3 cp $< $(VIRTUALBOX_S3_BUCKET) --storage-class $(S3_STORAGE_CLASS) --grants full=$(S3_GRANT_ID) read=$(S3_ALLUSERS_ID)
433458

459+
s3cp-$(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX): $(PARALLELS_BOX_DIR)/%$(BOX_SUFFIX)
460+
aws s3 cp $< $(PARALLELS_S3_BUCKET) --storage-class $(S3_STORAGE_CLASS) --grants full=$(S3_GRANT_ID) read=$(S3_ALLUSERS_ID)
461+
434462
s3cp-vmware: $(addprefix s3cp-,$(VMWARE_BOX_FILES))
435463
s3cp-virtualbox: $(addprefix s3cp-,$(VIRTUALBOX_BOX_FILES))
464+
s3cp-parallels: $(addprefix s3cp-,$(PARALLELS_BOX_FILES))

‎eval-win81x64-enterprise-cygwin.json

+32
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,38 @@
7575
["modifyvm", "{{.Name}}", "--cpus", "1"],
7676
["setextradata", "{{.Name}}", "VBoxInternal/CPUM/CMPXCHG16B", "1"]
7777
]
78+
},
79+
{
80+
"vm_name": "eval-win81x64-enterprise-cygwin",
81+
"type": "parallels-iso",
82+
"guest_os_type": "win-8.1",
83+
"iso_url": "{{ user `iso_url` }}",
84+
"iso_checksum": "{{ user `iso_checksum` }}",
85+
"iso_checksum_type": "sha1",
86+
"ssh_username": "vagrant",
87+
"ssh_password": "vagrant",
88+
"ssh_wait_timeout": "10000s",
89+
"floppy_files": [
90+
"floppy/eval-win81x64-enterprise/Autounattend.xml",
91+
"floppy/00-run-all-scripts.cmd",
92+
"floppy/install-winrm.cmd",
93+
"floppy/powerconfig.bat",
94+
"floppy/01-install-wget.cmd",
95+
"floppy/_download.cmd",
96+
"floppy/_packer_config.cmd",
97+
"floppy/passwordchange.bat",
98+
"floppy/disablewinupdate.bat",
99+
"floppy/cygwin.bat",
100+
"floppy/cygwin.sh",
101+
"floppy/zz-start-sshd.cmd"
102+
],
103+
"parallels_tools_flavor": "win",
104+
"shutdown_command": "{{ user `shutdown_command`}}",
105+
"disk_size": 40960,
106+
"prlctl": [
107+
["set", "{{.Name}}", "--memsize", "1536"],
108+
["set", "{{.Name}}", "--cpus", "1"]
109+
]
78110
}
79111
],
80112
"provisioners": [

‎eval-win81x64-enterprise.json

+31
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,37 @@
7373
["modifyvm", "{{.Name}}", "--cpus", "1"],
7474
["setextradata", "{{.Name}}", "VBoxInternal/CPUM/CMPXCHG16B", "1"]
7575
]
76+
},
77+
{
78+
"vm_name": "eval-win81x64-enterprise",
79+
"type": "parallels-iso",
80+
"guest_os_type": "win-8.1",
81+
"iso_url": "{{ user `iso_url` }}",
82+
"iso_checksum": "{{ user `iso_checksum` }}",
83+
"iso_checksum_type": "sha1",
84+
"ssh_username": "vagrant",
85+
"ssh_password": "vagrant",
86+
"ssh_wait_timeout": "10000s",
87+
"floppy_files": [
88+
"floppy/eval-win81x64-enterprise/Autounattend.xml",
89+
"floppy/00-run-all-scripts.cmd",
90+
"floppy/install-winrm.cmd",
91+
"floppy/powerconfig.bat",
92+
"floppy/01-install-wget.cmd",
93+
"floppy/_download.cmd",
94+
"floppy/_packer_config.cmd",
95+
"floppy/passwordchange.bat",
96+
"floppy/disablewinupdate.bat",
97+
"floppy/openssh.bat",
98+
"floppy/zz-start-sshd.cmd"
99+
],
100+
"parallels_tools_flavor": "win",
101+
"shutdown_command": "{{ user `shutdown_command`}}",
102+
"disk_size": 40960,
103+
"prlctl": [
104+
["set", "{{.Name}}", "--memsize", "1536"],
105+
["set", "{{.Name}}", "--cpus", "1"]
106+
]
76107
}
77108
],
78109
"provisioners": [

‎eval-win81x86-enterprise-cygwin.json

+32
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,38 @@
7575
["modifyvm", "{{.Name}}", "--cpus", "1"],
7676
["setextradata", "{{.Name}}", "VBoxInternal/CPUM/CMPXCHG16B", "1"]
7777
]
78+
},
79+
{
80+
"vm_name": "eval-win81x86-enterprise-cygwin",
81+
"type": "parallels-iso",
82+
"guest_os_type": "win-8.1",
83+
"iso_url": "{{ user `iso_url` }}",
84+
"iso_checksum": "{{ user `iso_checksum` }}",
85+
"iso_checksum_type": "sha1",
86+
"ssh_username": "vagrant",
87+
"ssh_password": "vagrant",
88+
"ssh_wait_timeout": "10000s",
89+
"floppy_files": [
90+
"floppy/eval-win81x86-enterprise/Autounattend.xml",
91+
"floppy/00-run-all-scripts.cmd",
92+
"floppy/install-winrm.cmd",
93+
"floppy/powerconfig.bat",
94+
"floppy/01-install-wget.cmd",
95+
"floppy/_download.cmd",
96+
"floppy/_packer_config.cmd",
97+
"floppy/passwordchange.bat",
98+
"floppy/disablewinupdate.bat",
99+
"floppy/cygwin.bat",
100+
"floppy/cygwin.sh",
101+
"floppy/zz-start-sshd.cmd"
102+
],
103+
"parallels_tools_flavor": "win",
104+
"shutdown_command": "{{ user `shutdown_command`}}",
105+
"disk_size": 40960,
106+
"prlctl": [
107+
["set", "{{.Name}}", "--memsize", "1536"],
108+
["set", "{{.Name}}", "--cpus", "1"]
109+
]
78110
}
79111
],
80112
"provisioners": [

‎eval-win81x86-enterprise.json

+31
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,37 @@
7373
["modifyvm", "{{.Name}}", "--cpus", "1"],
7474
["setextradata", "{{.Name}}", "VBoxInternal/CPUM/CMPXCHG16B", "1"]
7575
]
76+
},
77+
{
78+
"vm_name": "eval-win81x86-enterprise",
79+
"type": "parallels-iso",
80+
"guest_os_type": "win-8.1",
81+
"iso_url": "{{ user `iso_url` }}",
82+
"iso_checksum": "{{ user `iso_checksum` }}",
83+
"iso_checksum_type": "sha1",
84+
"ssh_username": "vagrant",
85+
"ssh_password": "vagrant",
86+
"ssh_wait_timeout": "10000s",
87+
"floppy_files": [
88+
"floppy/eval-win81x86-enterprise/Autounattend.xml",
89+
"floppy/00-run-all-scripts.cmd",
90+
"floppy/install-winrm.cmd",
91+
"floppy/powerconfig.bat",
92+
"floppy/01-install-wget.cmd",
93+
"floppy/_download.cmd",
94+
"floppy/_packer_config.cmd",
95+
"floppy/passwordchange.bat",
96+
"floppy/disablewinupdate.bat",
97+
"floppy/openssh.bat",
98+
"floppy/zz-start-sshd.cmd"
99+
],
100+
"parallels_tools_flavor": "win",
101+
"shutdown_command": "{{ user `shutdown_command`}}",
102+
"disk_size": 40960,
103+
"prlctl": [
104+
["set", "{{.Name}}", "--memsize", "1536"],
105+
["set", "{{.Name}}", "--cpus", "1"]
106+
]
76107
}
77108
],
78109
"provisioners": [

0 commit comments

Comments
 (0)