[pve-devel] [PATCH extjs 5/7] build: install via d/*.install

Fabian Grünbichler f.gruenbichler at proxmox.com
Wed Dec 5 11:34:26 CET 2018


since all the files are static anyway

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 Makefile                   | 29 +----------------------------
 debian/libjs-extjs.install |  7 +++++++
 2 files changed, 8 insertions(+), 28 deletions(-)
 create mode 100644 debian/libjs-extjs.install

diff --git a/Makefile b/Makefile
index b4ba1c1..1a2106b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,25 +7,7 @@ BUILD_DIR=${PACKAGE}-${PKGVER}
 DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
 DSC=${PACKAGE}_${PKGVER}-${PKGREL}.dsc
 
-# EXTJSDIR=ext-6.0.1
-# wget http://cdn.sencha.com/ext/gpl/ext-6.0.1-gpl.zip
-# unzip ext-6.0.1-gpl.zip
-
-EXTDATA=	\
-	extjs/build/ext-all.js	\
-	extjs/build/ext-all-debug.js	\
-	extjs/build/packages/charts/classic/charts.js	\
-	extjs/build/packages/charts/classic/charts-debug.js	\
-
-EXT_THEME=	\
-	extjs/build/classic/theme-crisp		\
-	extjs/build/packages/charts/classic/crisp	\
-
-DESTDIR=
-
-WWWEXT6DIR=${DESTDIR}/usr/share/javascript/extjs
-
-all: ${EXTDATA}
+all: deb
 
 ${BUILD_DIR}: debian extjs
 	rm -rf $@ $@.tmp
@@ -33,7 +15,6 @@ ${BUILD_DIR}: debian extjs
 	rsync -a debian/ $@.tmp/debian
 	mkdir $@.tmp/extjs
 	rsync -a extjs/build/ $@.tmp/extjs/build
-	cp Makefile $@.tmp/
 	cp extjs/licenses/license.txt $@.tmp/debian/copyright
 	mv $@.tmp $@
 
@@ -50,14 +31,6 @@ ${DSC}: ${BUILD_DIR}
 	cd ${BUILD_DIR}; dpkg-buildpackage -S -us -uc -nc -d
 	lintian $@
 
-.PHONY: install
-install: ${EXTDATA}
-	install -d ${WWWEXT6DIR}
-	install -m 0644 ${EXTDATA} ${WWWEXT6DIR}
-	cp -a extjs/build/classic/locale ${WWWEXT6DIR}
-	cp -a ${EXT_THEME} ${WWWEXT6DIR}
-	chown -R www-data:www-data ${WWWEXT6DIR}
-
 .PHONY: upload
 upload: ${DEB}
 	tar cf - ${DEB} | ssh repoman at repo.proxmox.com -- upload --product pve,pmg --dist stretch
diff --git a/debian/libjs-extjs.install b/debian/libjs-extjs.install
new file mode 100644
index 0000000..937e2e4
--- /dev/null
+++ b/debian/libjs-extjs.install
@@ -0,0 +1,7 @@
+extjs/build/classic/locale /usr/share/javascript/extjs
+extjs/build/classic/theme-crisp /usr/share/javascript/extjs
+extjs/build/ext-all-debug.js /usr/share/javascript/extjs
+extjs/build/ext-all.js /usr/share/javascript/extjs
+extjs/build/packages/charts/classic/charts-debug.js /usr/share/javascript/extjs
+extjs/build/packages/charts/classic/charts.js /usr/share/javascript/extjs
+extjs/build/packages/charts/classic/crisp /usr/share/javascript/extjs
-- 
2.19.2





More information about the pve-devel mailing list