Skip to content

Makefile: Restore accidentally deleted JQuery definitions #2770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
euanh merged 1 commit into from
Sep 14, 2016
Merged

Makefile: Restore accidentally deleted JQuery definitions #2770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Makefile: Restore accidentally deleted JQuery definitions 
Signed-off-by: Euan Harris <[email protected]>
  • Loading branch information
@euanh
euanh committed Sep 14, 2016
commit aaf99b9faee88277c6abae1274bb66c3f18f7f8c
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ endif

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

JQUERY=$(CARBON_DISTFILES)/javascript/jquery/jquery-1.1.3.1.pack.js
JQUERY_TREEVIEW=$(CARBON_DISTFILES)/javascript/jquery/treeview/jquery.treeview.zip

COMPILE_NATIVE ?= yes
COMPILE_BYTE ?= no
export COMPILE_NATIVE COMPILE_BYTE
Expand Down Expand Up @@ -139,7 +142,8 @@ xapi.spec: xapi.spec.in
srpm: xapi.spec
mkdir -p $(RPM_SOURCESDIR) $(RPM_SPECSDIR) $(RPM_SRPMSDIR)
while ! [ -d .git ]; do cd ..; done; \
git archive --prefix=xapi-1.10.0/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-1.10.0.tar.bz2 # xen-api/Makefile
git archive --prefix=xapi-1.9.57/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-1.9.57.tar.bz2 # xen-api/Makefile
cp $(JQUERY) $(JQUERY_TREEVIEW) $(RPM_SOURCESDIR)
make -C $(REPO) version
rm -f $(RPM_SOURCESDIR)/xapi-version.patch
(cd $(REPO); diff -u /dev/null ocaml/util/version.ml > $(RPM_SOURCESDIR)/xapi-version.patch) || true
Expand Down