← Back to branch summary

~davewalker/ubuntu/maverick/eucalyptus/lp611144

« back to all changes in this revision

Viewing changes to .pc/02-Makefile.patch/cluster/Makefile

  • Committer: Dustin Kirkland
  • Date: 2010-07-22 08:41:57 UTC
  • mfrom: (1050.1.19 ubuntu)
  • Revision ID: kirkland@x200-20100722084157-zh2p8dkawznvxxpn
Approving Dave Walker's merge of new upstream Eucalyptus 2.0 release.

Dustin Kirkland <kirkland@canonical.com>

* New major upstream version merge, 2.0 (r1211).
  - 01-wsdl-stubs.patch, debian/wsdl.md5sums: wsdl stubs updated.
  - 11-state-cleanup-memleakfix.patch: Removed, fixed upstream.
  - 21-eucalyptus-1.7-with-gwt-1.6.4.patch: New patch, allows 
    eucalyptus-1.7 to be built against gwt 1.6.4. Based on patch courtesy 
    of Dmitrii Zagorodnov, upstream. (LP: #597330)
* debian/eucalyptus-java-common.links: 
  - Changed symlink for groovy, point to groovy.all.jar, making compatiable 
    with groovy versions >1.7. (LP: #595421)
  - Added ant.jar & jetty-rewrite-handler.jar as they are now required.
* debian/control
  - & debian/build-jars: Added libjavassist-java and libjetty-extra-java as 
    build dependencies.
  - Added libjetty-extra-java as a dependency of eucalyptus-java-common
* The binary resulting jar's have been renamed from eucalyptus-*-1.6.2.jar
  to eucalyptus-*-main.jar:    
  - debian/eucalyptus-cc.upstart
  - debian/eucalyptus-cloud.install
  - debian/eucalyptus-common.eucalyptus.upstart
  - debian/eucalyptus-java-common.install
  - debian/eucalyptus-network.upstart
  - debian/eucalyptus-sc.install
  - debian/eucalyptus-walrus.install
* debian/eucalyptus-java-common.install: New upstream jars that have been
  installed:
  - eucalyptus-db-hsqldb-ext-main.jar
  - eucalyptus-component-main.jar
* debian/control:
  - Updated Standards Version to 3.8.4 (no change)
  - Updated the upstream Homepage to: http://open.eucalyptus.com/
  - Changed Vcs-Bzr to reflect new location of Ubuntu hosted development branch.
  - Made the Build Dependency of groovy and the binary eucalyptus-java-common
    package depend on version >=1.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/02-Makefile.patch/cluster/Makefile
1
 
#
2
 
#
3
 
 
4
 
include ../Makedefs
5
 
 
6
 
WSDLPATH=../wsdl
7
 
CCWSDLNAME=eucalyptus_cc.wsdl
8
 
CCWSDL=$(WSDLPATH)/$(CCWSDLNAME)
9
 
NCWSDLNAME=eucalyptus_nc.wsdl
10
 
NCWSDL=$(WSDLPATH)/$(NCWSDLNAME)
11
 
SERVICE_SO=libEucalyptusCC.so
12
 
SERVICE_NAME=EucalyptusCC
13
 
CLIENT=CCclient
14
 
CLIENTKILLALL=euca_killall
15
 
#WSDL2C=${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh
16
 
NCLIBS=../util/data.o ../node/client-marshal-adb.o ../util/ipc.o
17
 
SCLIBS=../storage/storage.o 
18
 
VNLIBS=../net/vnetwork.o ../util/misc.o
19
 
WSSECLIBS=../util/euca_axis.o ../util/euca_auth.o
20
 
CC_LIBS         = ${LIBS} -lcurl
21
 
 
22
 
all: server client
23
 
 
24
 
build: all
25
 
 
26
 
generated/stubs: $(CCWSDL) $(NCWSDL)
27
 
        rm -rf generated
28
 
        mkdir -p generated
29
 
        @echo Generating client stubs
30
 
        sh $(WSDL2C) -uri $(CCWSDL) -g -d adb -u -uw -f -o generated | grep -v 'the classpath'
31
 
        @echo Generating NCclient stubs
32
 
        sh $(WSDL2C) -uri $(NCWSDL) -g -d adb -u -uw -f -o generated | grep -v 'the classpath'
33
 
        @echo Generating server stubs
34
 
        sh $(WSDL2C) -uri $(CCWSDL) -sd -ss -d adb -u -uw -f -o generated | grep -v 'the classpath'
35
 
        @echo Adding marshalling calls to server stubs
36
 
        ../tools/add_marshalling.pl generated/axis2_skel_*.c
37
 
        @echo Compiling the stubs
38
 
        cd generated; patch -p1 < ../axis2_svc_generated.patch; $(CC) -c $(CFLAGS) $(INCLUDES) *.c
39
 
        @echo "this is a cute little makefile marker" >generated/stubs
40
 
        @echo Stubs generated.
41
 
 
42
 
.c.o:
43
 
        $(CC) -c $(CFLAGS) $(INCLUDES) $<
44
 
 
45
 
server: $(SERVICE_SO)
46
 
 
47
 
$(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o handlers.o $(AXIS2C_HOME)/lib/libaxutil.so 
48
 
        $(CC) -shared generated/*.o server-marshal.o handlers.o $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS) -o $(SERVICE_SO)
49
 
 
50
 
client: $(CLIENT)_full $(CLIENTKILLALL)
51
 
 
52
 
$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
53
 
        $(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
54
 
 
55
 
$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
56
 
        $(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
57
 
 
58
 
deploy:
59
 
        $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
60
 
        $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
61
 
        $(INSTALL) $(CCWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
62
 
#no ws-sec
63
 
        cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
64
 
 
65
 
#ws-sec
66
 
        cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
67
 
        cat ../tools/client-policy-template.xml | sed "s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed "s:AXIS2C_HOME:$(AXIS2C_HOME):g" | sed "s:CLIENT-CERT:cloud-cert.pem:g" | sed "s:SERVER-CERT:cluster-cert.pem:g" | sed "s:SERVER-KEY:cluster-pk.pem:g" | sed "s:CLIENT-KEY:cloud-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > cc-client-policy.xml
68
 
##      cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
69
 
#       cp cc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
70
 
#       chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
71
 
# ws
72
 
        $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
73
 
# no ws
74
 
#       cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
75
 
 
76
 
clean:
77
 
        rm -f $(SERVICE_SO) *.o $(CLIENTKILLALL) $(CLIENT)_full *~* *#*
78
 
 
79
 
distclean: clean
80
 
        rm -rf generated
81
 
 
82
 
install: deploy
83
 
        @$(INSTALL) -m 0555 $(CLIENTKILLALL) $(DESTDIR)$(sbindir)
84
 
        @$(INSTALL) cc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
85
 
 
86
 
uninstall:
87
 
        @$(RM) -f $(DESTDIR)$(sbindir)/$(CLIENTKILLALL)
88
 
        @$(RM) -f $(DESTDIR)$(vardir)/lib/eucalyptus/keys/cc-client-policy.xml
89
 
        @$(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)