From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id AB5C0735EC
for <pve-devel@lists.proxmox.com>; Fri, 28 May 2021 14:13:44 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A6FAA960C
for <pve-devel@lists.proxmox.com>; Fri, 28 May 2021 14:13:44 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 0D08B95F6
for <pve-devel@lists.proxmox.com>; Fri, 28 May 2021 14:13:43 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DAB07466C0
for <pve-devel@lists.proxmox.com>; Fri, 28 May 2021 14:13:42 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 28 May 2021 14:13:41 +0200
Message-Id: <20210528121341.16026-4-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210528121341.16026-1-d.csapak@proxmox.com>
References: <20210528121341.16026-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.042 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [proxmox-widget-toolkit-dev.docs, proxmox-widget-toolkit.docs]
Subject: [pve-devel] [PATCH widget-toolkit 3/3] add
proxmox-widget-toolkit-dev package
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 28 May 2021 12:13:44 -0000
used for various other packages to dev-depend on (e.g. pve-docs)
which only contains the Toolkit.js for now
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
Makefile | 19 +++++++++++--------
debian/control | 7 +++++++
.../{docs => proxmox-widget-toolkit-dev.docs} | 0
debian/proxmox-widget-toolkit-dev.install | 2 ++
debian/proxmox-widget-toolkit.docs | 1 +
debian/proxmox-widget-toolkit.install | 1 +
6 files changed, 22 insertions(+), 8 deletions(-)
rename debian/{docs => proxmox-widget-toolkit-dev.docs} (100%)
create mode 100644 debian/proxmox-widget-toolkit-dev.install
create mode 100644 debian/proxmox-widget-toolkit.docs
create mode 100644 debian/proxmox-widget-toolkit.install
diff --git a/Makefile b/Makefile
index c0fe06d..0060296 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ export DEB_VERSION_UPSTREAM_REVISION
export PACKAGE=proxmox-widget-toolkit
BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+WT_DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+WT_DEV_DEB=${PACKAGE}-dev_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DEBS=${WT_DEB} ${WT_DEV_DEB}
DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
GITVERSION:=$(shell git rev-parse HEAD)
@@ -16,10 +18,10 @@ ${BUILDDIR}:
mv ${BUILDDIR}.tmp/ ${BUILDDIR}
.PHONY: deb
-deb: ${DEB}
-${DEB}: ${BUILDDIR}
+deb: ${DEBS}
+${DEBS}: ${BUILDDIR}
cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
- lintian ${DEB}
+ lintian ${DEBS}
.PHONY: dsc
dsc: ${DSC}
@@ -32,8 +34,9 @@ lint: ${JSSRC}
${MAKE} -C src lint
.PHONY: upload
-upload: ${DEB}
- tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster
+upload: ${DEBS}
+ tar cf - ${WT_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster
+ tar cf - ${WT_DEV_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product devel --dist buster
distclean: clean
clean:
@@ -42,5 +45,5 @@ clean:
find . -name '*~' -exec rm {} ';'
.PHONY: dinstall
-dinstall: ${DEB}
- dpkg -i ${DEB}
+dinstall: ${DEBS}
+ dpkg -i ${DEBS}
diff --git a/debian/control b/debian/control
index 45ca9b4..ad88929 100644
--- a/debian/control
+++ b/debian/control
@@ -12,3 +12,10 @@ Architecture: all
Depends: ${misc:Depends}
Description: ExtJS Helper Classes for Proxmox
ExtJS Helper Classes to easy access to Proxmox APIs.
+
+Package: proxmox-widget-toolkit-dev
+Architecture: all
+Depends: ${misc:Depends}
+Description: Development dependencies for Proxmox Projects
+ Contains some common javascript code that are dev-dependencies,
+ for various Proxmox projects.
diff --git a/debian/docs b/debian/proxmox-widget-toolkit-dev.docs
similarity index 100%
rename from debian/docs
rename to debian/proxmox-widget-toolkit-dev.docs
diff --git a/debian/proxmox-widget-toolkit-dev.install b/debian/proxmox-widget-toolkit-dev.install
new file mode 100644
index 0000000..514d1d0
--- /dev/null
+++ b/debian/proxmox-widget-toolkit-dev.install
@@ -0,0 +1,2 @@
+Toolkit.js /usr/share/javascript/proxmox-widget-toolkit-dev/
+api-viewer/APIVIEWER.js /usr/share/javascript/proxmox-widget-toolkit-dev/
diff --git a/debian/proxmox-widget-toolkit.docs b/debian/proxmox-widget-toolkit.docs
new file mode 100644
index 0000000..8696672
--- /dev/null
+++ b/debian/proxmox-widget-toolkit.docs
@@ -0,0 +1 @@
+debian/SOURCE
diff --git a/debian/proxmox-widget-toolkit.install b/debian/proxmox-widget-toolkit.install
new file mode 100644
index 0000000..3c85d66
--- /dev/null
+++ b/debian/proxmox-widget-toolkit.install
@@ -0,0 +1 @@
+/usr/share/javascript/proxmox-widget-toolkit
--
2.20.1