summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2008-01-07 19:00:16 +0000
committerRichard W.M. Jones <rjones@redhat.com>2008-01-07 19:00:16 +0000
commit87ffb7220a8656ca383d146c769a1186198acb21 (patch)
tree11fc053a4a44072d1e0a4c3a7325ec0ebb9743d4
parent7ae8ab4cf04a8d0705115af44fa7364ebc01b167 (diff)
downloadvirt-top-87ffb7220a8656ca383d146c769a1186198acb21.zip
virt-top-87ffb7220a8656ca383d146c769a1186198acb21.tar.gz
virt-top-87ffb7220a8656ca383d146c769a1186198acb21.tar.xz
Include mlvirtmanager in the Windows installer.
* wininstaller.nsis.in: Include mlvirtmanager in the Windows installer. * Makefile.in: Re-enable native code builds for Windows installer. * mlvirtmanager/Makefile.in: Pass $(LDFLAGS) when building on Windows - you need to specify the location of $GTK/lib.
-rwxr-xr-xChangeLog7
-rwxr-xr-xMakefile.in2
-rwxr-xr-xmlvirtmanager/Makefile.in4
-rwxr-xr-xwininstaller.nsis.in6
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c8b673a..c8f24f9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-01-07 Richard Jones <rjones@redhat.com>
+ Include mlvirtmanager in the Windows installer.
+ * wininstaller.nsis.in: Include mlvirtmanager in the Windows
+ installer.
+ * Makefile.in: Re-enable native code builds for Windows installer.
+ * mlvirtmanager/Makefile.in: Pass $(LDFLAGS) when building on
+ Windows - you need to specify the location of $GTK/lib.
+
Bundle Gtk DLLs and support files in the Windows installer.
* configure.ac: Detect library paths instead of hard-
coding them.
diff --git a/Makefile.in b/Makefile.in
index a7cc00b..172b103 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,7 +72,7 @@ endif
ifneq ($(MAKENSIS),)
wininstaller: $(PACKAGE)-$(VERSION).exe
-$(PACKAGE)-$(VERSION).exe: wininstaller.nsis all # opt
+$(PACKAGE)-$(VERSION).exe: wininstaller.nsis all opt
"$(MAKENSIS)" \
//DPACKAGE=$(PACKAGE) //DVERSION=$(VERSION) \
//DOUTFILE=$@ $<
diff --git a/mlvirtmanager/Makefile.in b/mlvirtmanager/Makefile.in
index b09cc57..b9bf280 100755
--- a/mlvirtmanager/Makefile.in
+++ b/mlvirtmanager/Makefile.in
@@ -73,8 +73,8 @@ mlvirtmanager: $(VIRTMANAGER_OBJS)
../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
mlvirtmanager.opt: $(VIRTMANAGER_XOBJS)
- $(OCAMLOPT) \
- $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+ $(OCAMLOPT) -verbose $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+ -cclib "$(LDFLAGS)" \
../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
endif
diff --git a/wininstaller.nsis.in b/wininstaller.nsis.in
index f348540..92c5789 100755
--- a/wininstaller.nsis.in
+++ b/wininstaller.nsis.in
@@ -86,7 +86,7 @@ SectionEnd
Section "Programs (recommended)"
SetOutPath $INSTDIR
File "/oname=mlvirsh.exe" "mlvirsh\mlvirsh.opt"
- #File "/oname=mlvirtmanager.exe" "mlvirsh\mlvirtmanager.opt"
+ File "/oname=mlvirtmanager.exe" "mlvirsh\mlvirtmanager.opt"
SectionEnd
Section "OCaml Libvirt bindings (for developers only)"
@@ -97,18 +97,22 @@ Section "Start Menu Shortcuts"
CreateDirectory "$SMPROGRAMS\${PACKAGE}"
CreateShortCut "$SMPROGRAMS\${PACKAGE}\Uninstall.lnk" "$INSTDIR\Uninstall ${PACKAGE}.exe" "" "$INSTDIR\Uninstall ${PACKAGE}.exe" 0
CreateShortCut "$SMPROGRAMS\${PACKAGE}\Virt Shell.lnk" "$INSTDIR\mlvirsh.exe" "" "$INSTDIR\mlvirsh.exe" 0
+ CreateShortCut "$SMPROGRAMS\${PACKAGE}\Virt Control.lnk" "$INSTDIR\mlvirtmanager.exe" "" "$INSTDIR\mlvirtmanager.exe" 0
SectionEnd
Section "Desktop Icons"
CreateShortCut "$DESKTOP\Virt Shell.lnk" "$INSTDIR\mlvirsh.exe" "" "$INSTDIR\mlvirsh.exe" 0
+ CreateShortCut "$DESKTOP\Virt Control.lnk" "$INSTDIR\mlvirtmanager.exe" "" "$INSTDIR\mlvirtmanager.exe" 0
SectionEnd
Section "Uninstall"
# Desktop icons
Delete /rebootok "$DESKTOP\Virt Shell.lnk"
+ Delete /rebootok "$DESKTOP\Virt Control.lnk"
# Menu shortcuts
Delete /rebootok "$SMPROGRAMS\${PACKAGE}\Virt Shell.lnk"
+ Delete /rebootok "$SMPROGRAMS\${PACKAGE}\Virt Control.lnk"
Delete /rebootok "$SMPROGRAMS\${PACKAGE}\Uninstall.lnk"
RMDir "$SMPROGRAMS\${PACKAGE}"