generate index.html.tpl from vnc.html

[novnc-pve.git] / Makefile

diff --git a/Makefile b/Makefile
index 486853528461fe04af6fec9bf0af2d649ed4ebd7..9ddde443ca5c578fb28ae663c859308639d571cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-RELEASE=3.2
+RELEASE=4.2
 
 PACKAGE=novnc-pve
-PKGREL=1
+PKGREL=8
 
 NOVNCDIR=novnc
 NOVNCSRC=${NOVNCDIR}.tgz
-NOVNCVER=0.4
+NOVNCVER=0.5
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
@@ -19,11 +19,13 @@ dinstall: deb
        dpkg -i ${DEB}
 
 .PHONY: deb
-deb ${DEB}: ${TARSRC}
+deb: ${DEB}
+${DEB}: ${TARSRC}
        rm -rf ${NOVNCDIR}
        tar xf ${NOVNCSRC}
-       mv ${NOVNCDIR}/debian ${NOVNCDIR}/debian.org
        cp -a debian ${NOVNCDIR}/debian
+       cp ${NOVNCDIR}/include/ui.js ${NOVNCDIR}/pveui.js
+       cp ${NOVNCDIR}/vnc.html ${NOVNCDIR}/index.html.tpl
        # fix file permissions
        chmod 0644 ${NOVNCDIR}/include/jsunzip.js
        echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${NOVNCDIR}/debian/SOURCE
@@ -34,17 +36,12 @@ deb ${DEB}: ${TARSRC}
 download:
        rm -rf ${NOVNCDIR}
        git clone git://github.com/kanaka/noVNC ${NOVNCDIR}
+       cd ${NOVNCDIR}; git checkout -b local a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a
        tar czf ${NOVNCSRC} ${NOVNCDIR}
 
 .PHONY: upload
 upload: ${DEB}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEB} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+       tar cf - ${DEB}|ssh repoman@repo.proxmox.com upload
 
 .PHONY: distclean
 distclean: clean