The pull request has existed for a while now so I though I'd better send these to the list as well.
Cheers, M -- Magnus Therning [email protected] XenServer Security Lead There does not now, nor will there ever, exist a programming language in which it is the least bit hard to write bad programs. -- Flon's Axiom I invented the term Object-Oriented, and I can tell you I did not have C++ in mind. -- Alan Kay
>From 6d505cbaa76298dc85b0299a2090b6aaf8f7b9fe Mon Sep 17 00:00:00 2001 From: Magnus Therning <[email protected]> Date: Tue, 14 Dec 2010 17:00:08 +0000 Subject: [PATCH 1/3] rpmbuild, step one. To: [email protected] Signed-off-by: Magnus Therning <[email protected]> --- Makefile.xcp | 23 +++++++++++++++++++++++ ocaml/lvhdrt/OMakefile | 2 +- xapi.spec | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Makefile.xcp b/Makefile.xcp new file mode 100644 index 0000000..146489f --- /dev/null +++ b/Makefile.xcp @@ -0,0 +1,23 @@ +ifdef B_BASE +include $(B_BASE)/common.mk +REPO=$(call hg_loc,xen-api) +else +MY_OUTPUT_DIR ?= $(CURDIR)/output +MY_OBJ_DIR ?= $(CURDIR)/obj +REPO ?= $(CURDIR) + +RPM_SPECSDIR?=/usr/src/redhat/SPECS +RPM_SRPMSDIR?=/usr/src/redhat/SRPMS +RPM_SOURCEDIR?=/usr/src/redhat/SOURCES +XEN_RELEASE?=unknown +endif + + +.PHONY: srpm +srpm: + git archive --format=tar --prefix=xapi-0.2/ HEAD | bzip2 > $(RPM_SOURCEDIR)/xapi-0.2.tar.bz2 + rpmbuild --define "XEN_RELEASE $(XEN_RELEASE)" -bs --nodeps xapi.spec + +.PHONY: rpm +rpm: + rpmbuild -bb xapi.spec diff --git a/ocaml/lvhdrt/OMakefile b/ocaml/lvhdrt/OMakefile index c8230cb..7c4442e 100644 --- a/ocaml/lvhdrt/OMakefile +++ b/ocaml/lvhdrt/OMakefile @@ -2,7 +2,7 @@ OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend OCAMLINCLUDES = ../idl/ocaml_backend/ ../idl ../autogen OCAMLPACKS = xml-light2 stdext stunnel http-svr log -IEXE=install -m 755 -o root -g root +IEXE=install -D -m 755 -o root -g root OCamlProgram(lvhdrt, lvhdrt lvhdrt_exceptions utils globs fists tc_8670 tc_8682 tc_8699 tc_8700 tc_8707 tc_8713 tc_8766 tc_8775) diff --git a/xapi.spec b/xapi.spec index f2586f5..80a0290 100644 --- a/xapi.spec +++ b/xapi.spec @@ -10,7 +10,7 @@ Group: System/Hypervisor License: LGPL+linking exception URL: http://www.xen.org Source0: xapi-%{version}.tar.bz2 -Patch0: xapi-version.patch +#Patch0: xapi-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pam-devel tetex xapi-libs-devel ocaml omake ocaml-findlib ocaml-xmlm @@ -84,7 +84,7 @@ This package contains Xen-API documentation and examples in several programming %prep %setup -q -%patch0 -p0 -b xapi-version.patch +#%patch0 -p0 -b xapi-version.patch %build COMPILE_JAVA=no %{__make} -- 1.7.3.5
>From 8804e1e7b524aac61130f23b4c3ed965b3397681 Mon Sep 17 00:00:00 2001 From: Magnus Therning <[email protected]> Date: Tue, 14 Dec 2010 17:08:46 +0000 Subject: [PATCH 2/3] Adding missing build requirements. To: [email protected] Signed-off-by: Magnus Therning <[email protected]> --- xapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xapi.spec b/xapi.spec index 80a0290..e139399 100644 --- a/xapi.spec +++ b/xapi.spec @@ -12,7 +12,7 @@ URL: http://www.xen.org Source0: xapi-%{version}.tar.bz2 #Patch0: xapi-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pam-devel tetex xapi-libs-devel ocaml omake ocaml-findlib ocaml-xmlm +BuildRequires: pam-devel tetex xapi-libs-devel ocaml omake ocaml-findlib ocaml-xmlm lynx tetex-latex %description XCP toolstack. -- 1.7.3.5
>From f196aeadcf315e0ef836908385494f9ea24c8a42 Mon Sep 17 00:00:00 2001 From: Magnus Therning <[email protected]> Date: Wed, 15 Dec 2010 14:09:40 +0000 Subject: [PATCH 3/3] Deal with stuff that is in distfiles. Not complete. To: [email protected] Signed-off-by: Magnus Therning <[email protected]> --- ocaml/idl/OMakefile | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ocaml/idl/OMakefile b/ocaml/idl/OMakefile index 44291a0..be363ff 100644 --- a/ocaml/idl/OMakefile +++ b/ocaml/idl/OMakefile @@ -128,10 +128,18 @@ sdk-install: datamodel html_build xenenterpriseapi.pdf mkdir -p $(SDK)/docs/html sh -c '/bin/cp -ar /tmp/docs/html/merged/API $(SDK)/docs/html' cp /tmp/docs/html/autogen/classes.html $(SDK)/docs/html - cp $(JQUERY) $(SDK)/docs/html + if test -f $(JQUERY); then \ + cp $(JQUERY) $(SDK)/docs/html; \ + else; \ + (cd $(SDK)/docs/html; wget http://jqueryjs.googlecode.com/files/jquery-1.1.3.1.pack.js); \ + fi mkdir -p $(SDK)/docs/html/images - unzip -o -j -d $(SDK)/docs/html/images $(JQUERYTREEVIEWZIP) images/* - unzip -o -j -d $(SDK)/docs/html $(JQUERYTREEVIEWZIP) *.js images/* + if test -f $(JQUERYTREEVIEWZIP); then \ + unzip -o -j -d $(SDK)/docs/html/images $(JQUERYTREEVIEWZIP) images/*; \ + unzip -o -j -d $(SDK)/docs/html $(JQUERYTREEVIEWZIP) *.js images/*; \ + else; \ + echo "We are using an old version of treeview, the available version requires jquery 1.2. Time to upgrade."; \ + fi #./datamodel -closed -html $(SDK)/docs/html mkdir -p $(SDK)/docs/pdf cp xenenterpriseapi.pdf $(SDK)/docs/pdf/ -- 1.7.3.5
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
