Skip to content

Commit dc67077

Browse files
authored
Merge pull request xapi-project#2770 from euanh/restore-jquery
Makefile: Restore accidentally deleted JQuery definitions
2 parents c0e5632 + aaf99b9 commit dc67077

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ endif
1616

1717
BASE_PATH=$(shell scripts/base-path scripts/xapi.conf)
1818

19+
JQUERY=$(CARBON_DISTFILES)/javascript/jquery/jquery-1.1.3.1.pack.js
20+
JQUERY_TREEVIEW=$(CARBON_DISTFILES)/javascript/jquery/treeview/jquery.treeview.zip
21+
1922
COMPILE_NATIVE ?= yes
2023
COMPILE_BYTE ?= no
2124
export COMPILE_NATIVE COMPILE_BYTE
@@ -139,7 +142,8 @@ xapi.spec: xapi.spec.in
139142
srpm: xapi.spec
140143
mkdir -p $(RPM_SOURCESDIR) $(RPM_SPECSDIR) $(RPM_SRPMSDIR)
141144
while ! [ -d .git ]; do cd ..; done; \
142-
git archive --prefix=xapi-1.10.0/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-1.10.0.tar.bz2 # xen-api/Makefile
145+
git archive --prefix=xapi-1.9.57/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-1.9.57.tar.bz2 # xen-api/Makefile
146+
cp $(JQUERY) $(JQUERY_TREEVIEW) $(RPM_SOURCESDIR)
143147
make -C $(REPO) version
144148
rm -f $(RPM_SOURCESDIR)/xapi-version.patch
145149
(cd $(REPO); diff -u /dev/null ocaml/util/version.ml > $(RPM_SOURCESDIR)/xapi-version.patch) || true

0 commit comments

Comments
 (0)