← Back to branch summary

~ubuntu-core-dev/ubuntu/maverick/eucalyptus/devel

« back to all changes in this revision

Viewing changes to .pc/02-Makefile.patch/node/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/node/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=libEucalyptusNC.so
 
12
SERVICE_NAME=EucalyptusNC
 
13
CLIENT=NCclient
 
14
#WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
 
15
NC_LIBS                 = $(LIBS) -lvirt -lcurl -lssl
 
16
NC_HANDLERS=handlers_xen.o handlers_kvm.o handlers_default.o
 
17
 
 
18
all: server client clientlib test_nc test
 
19
 
 
20
build: all
 
21
 
 
22
generated/stubs: $(NCWSDL)
 
23
        @echo Generating server stubs
 
24
        rm -rf generated
 
25
        mkdir -p generated
 
26
        sh $(WSDL2C) -uri $(NCWSDL) -sd -ss -d adb -u -uw -f -o generated | grep -v 'the classpath'
 
27
        @echo Adding marshalling calls to server stubs
 
28
        ../tools/add_marshalling.pl generated/axis2_skel_*.c
 
29
        @echo Generating client stubs
 
30
        sh $(WSDL2C) -uri $(NCWSDL) -g -d adb -u -uw -f -o generated | grep -v 'the classpath'
 
31
        @echo Compiling the stubs
 
32
        cd generated; patch -p1 < ../axis2_svc_generated.patch; $(CC) -c $(CFLAGS) $(INCLUDES) *.c
 
33
        @echo "this is a cute little makefile marker" >generated/stubs
 
34
        @echo Stubs generated.
 
35
 
 
36
.c.o:
 
37
        $(CC) -c $(CFLAGS) $(INCLUDES) $<
 
38
 
 
39
server: $(SERVICE_SO)
 
40
 
 
41
../storage/storage.o: ../storage/storage.c ../util/misc.o ../util/data.o
 
42
        make -C ../storage
 
43
 
 
44
../storage/walrus.o: ../storage/walrus.c ../util/misc.o ../util/data.o
 
45
        make -C ../storage
 
46
 
 
47
../net/vnetwork.o: ../net/vnetwork.c
 
48
        make -C ../net
 
49
 
 
50
../util/misc.o: ../util/misc.c ../util/misc.h ../util/eucalyptus.h
 
51
        make -C ../util
 
52
 
 
53
../util/data.o: ../util/data.c ../util/data.h ../util/eucalyptus.h
 
54
        make -C ../util
 
55
 
 
56
../util/euca_auth.o: ../util/euca_auth.c ../util/data.h ../util/eucalyptus.h
 
57
        make -C ../util
 
58
 
 
59
$(SERVICE_SO): generated/stubs ../storage/storage.o ../storage/walrus.o ../net/vnetwork.o ../util/misc.o ../util/data.o server-marshal.o handlers.o $(NC_HANDLERS) $(AXIS2C_HOME)/lib/libaxutil.so ../util/eucalyptus.h ../util/euca_auth.o
 
60
        $(CC) -o $(SERVICE_SO) -shared $(NC_LIBS) generated/adb_*.o generated/axis2*_skel_*.o server-marshal.o handlers.o $(NC_HANDLERS) ../storage/walrus.o ../storage/storage.o ../net/*.o ../util/*.o
 
61
 
 
62
clientlib: generated/stubs ../util/data.o client-marshal-adb.o
 
63
 
 
64
client: $(CLIENT) $(CLIENT)_local
 
65
 
 
66
$(CLIENT): generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o $(AXIS2C_HOME)/lib/libaxutil.so $(CLIENT).c
 
67
        $(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(NC_LIBS) generated/adb_*.o generated/axis2_stub_*.o client-marshal-adb.o ../util/*.o ../storage/storage.o ../storage/walrus.o ../net/*.o $(CLIENT).c
 
68
 
 
69
$(CLIENT)_local: generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o handlers.o $(NC_HANDLERS) $(CLIENT).c ../util/euca_auth.o
 
70
        $(CC) -o $(CLIENT)_local $(INCLUDES) $(CFLAGS) client-marshal-local.o ../util/*.o ../storage/storage.o ../storage/walrus.o ../net/*.o handlers.o $(NC_HANDLERS) $(CLIENT).c $(NC_LIBS)
 
71
 
 
72
test: test.c ../util/misc.o ../util/data.o
 
73
        $(CC) $(CFLAGS) $(INCLUDES) $(NC_LIBS) -o test test.c ../util/misc.o ../util/data.o
 
74
 
 
75
test_nc: test_nc.c ../util/misc.o
 
76
        $(CC) $(CFLAGS) $(INCLUDES) $(NC_LIBS) -o test_nc test_nc.c ../util/misc.o
 
77
 
 
78
deploy:
 
79
        $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
 
80
        $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
 
81
 
 
82
# no ws-sec
 
83
        cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
 
84
# ws-sec
 
85
        cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(NCWSDLNAME) | ../tools/add_service_policy.pl ../tools/service-policy-template.xml | sed "s:CLIENT-CERT:cluster-cert.pem:g" | sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml
 
86
        cat ../tools/client-policy-template.xml | sed "s:EUCALYPTUS_HOME:$(EUCALYPTUS):g" | sed "s:AXIS2C_HOME:$(AXIS2C_HOME):g"  | sed "s:CLIENT-CERT:cluster-cert.pem:g" | sed "s:CLIENT-KEY:cluster-pk.pem:g" | sed "s:SERVER-CERT:node-cert.pem:g" | sed "s:SERVER-KEY:node-pk.pem:g" | sed "s:CLIENT-USERNAME:eucalyptus:g" > nc-client-policy.xml
 
87
#       cp nc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
 
88
##      cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
 
89
#       chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
 
90
# ws
 
91
        $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
 
92
# no ws
 
93
#       cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
 
94
 
 
95
clean:
 
96
        rm -rf $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local *~* *#*
 
97
 
 
98
distclean:
 
99
        rm -rf generated $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local *~* *#*
 
100
 
 
101
install: deploy
 
102
        $(INSTALL) nc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
 
103
        $(INSTALL) -m 0755 test_nc $(DESTDIR)$(sbindir)/euca_test_nc
 
104
 
 
105
uninstall:
 
106
        $(RM) -f $(DESTDIR)$(vardir)/lib/eucalyptus/keys/nc-client-policy.xml
 
107
        $(RM) -f $(DESTDIR)$(sbindir)/euca_test_nc
 
108
        $(RM) -rf $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)
 
109