View | Details | Raw Unified | Return to bug 1591
Collapse All | Expand All

(-)a/bakeconf.xml (-27 / +104 lines)
 Lines 7-21    Link Here 
7
 	<attribute name="module_directory" value="dce"/>
7
 	<attribute name="module_directory" value="dce"/>
8
      </source>
8
      </source>
9
       <depends_on name="ns-3-dev-dce" optional="False"/>
9
       <depends_on name="ns-3-dev-dce" optional="False"/>
10
       <depends_on name="elf-loader" optional="False"/>
10
       <depends_on name="iperf" optional="True"/>
11
       <depends_on name="iperf" optional="True"/>
11
       <depends_on name="ccnx" optional="True"/>
12
       <depends_on name="ccnx" optional="True"/>
12
      <build type="waf" objdir="build">
13
      <build type="waf" objdir="build">
13
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --verbose"/>
14
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR"/>
14
	<attribute name="post_installation" value="export DCE_PATH=$INSTALLDIR/bin:$INSTALLDIR/bin_dce;export DCE_ROOT=$INSTALLDIR;export LD_LIBRARY_PATH=$INSTALLDIR/lib:$INSTALLDIR/bin:$SRCDIR/../ns-3-dev-dce/build;$INSTALLDIR/bin/ns3test-dce --verbose"/>
15
	<attribute name="post_installation" value="cd $SRCDIR; ./waf --run ns3test-dce"/>
15
        <attribute name="v_PATH" value="$SRCDIR;$SRCDIR/../build/bin" />
16
        <attribute name="v_LD_LIBRARY" value="$OBJDIR/..;$SRCDIR;$SRCDIR/../ns-3-dev-dce/build;$INSTALLDIR" />
17
        <attribute name="v_PKG_CONFIG" value="$SRCDIR/../ns-3-dev-dce/build/lib/pkgconfig;$OBJDIR/../../ns-3-dev-" />
18
        <attribute name="new_variable" value="DCE_PATH=$INSTALLDIR/bin:$INSTALLDIR/bin_dce;DCE_ROOT=$INSTALLDIR;LD_LIBRARY_PATH=$INSTALLDIR/lib:$INSTALLDIR/bin:$SRCDIR/../ns-3-dev-dce/build" />
19
     </build>
16
     </build>
20
    </module>
17
    </module>
21
18
 Lines 24-38    Link Here 
24
	<attribute name="url" value="http://code.nsnam.org/furbani/ns-3-dce"/>
21
	<attribute name="url" value="http://code.nsnam.org/furbani/ns-3-dce"/>
25
 	<attribute name="module_directory" value="dce"/>
22
 	<attribute name="module_directory" value="dce"/>
26
     </source>
23
     </source>
24
       <depends_on name="elf-loader" optional="False"/>
27
       <depends_on name="ns-3-linux" optional="False"/>
25
       <depends_on name="ns-3-linux" optional="False"/>
26
       <depends_on name="iproute" optional="False"/>
28
       <depends_on name="ns-3-dev-dce" optional="False"/>
27
       <depends_on name="ns-3-dev-dce" optional="False"/>
29
30
      <build type="waf" objdir="yes" sourcedir="dce">
28
      <build type="waf" objdir="yes" sourcedir="dce">
31
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-kernel-stack=$SRCDIR/../ns-3-linux --verbose"/>
29
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-kernel-stack=$SRCDIR/../ns-3-linux"/>
32
	<attribute name="post_installation" value="BASEDCE=$SRCDIR;DCE_PATH=$SRCDIR/build/bin_dce:$SRCDIR/build/bin;DCE_ROOT=$BASEDCE/build;LD_LIBRARY_PATH=$OBJDIR/../build/lib:$SRCDIR/build/bin:$SRCDIR/../ns-3-dev-dce/build;$OBJDIR/../build/bin/ns3test-dce --verbose"/>
30
	<attribute name="post_installation" value="cd $SRCDIR; ./waf --run ns3test-dce"/>
33
        <attribute name="v_PATH" value="$SRCDIR;$SRCDIR/../build/bin" />
34
        <attribute name="v_LD_LIBRARY" value="$OBJDIR/..;$SRCDIR;$SRCDIR/../ns-3-dev-dce/build;$INSTALLDIR" />
35
        <attribute name="v_PKG_CONFIG" value="$SRCDIR/../ns-3-dev-dce/build/lib/pkgconfig" />
36
      </build>
31
      </build>
37
    </module>
32
    </module>
38
33
 Lines 74-107    Link Here 
74
    <module name="ns-3-dev-dce">
69
    <module name="ns-3-dev-dce">
75
      <source type="mercurial">
70
      <source type="mercurial">
76
	<attribute name="url" value="http://code.nsnam.org/ns-3-dev"/>
71
	<attribute name="url" value="http://code.nsnam.org/ns-3-dev"/>
77
	<attribute name="revision" value="55055ecdbd47"/>
78
      </source>
72
      </source>
79
      <build type="waf" objdir="yes">
73
      <build type="waf" objdir="yes">
80
	<attribute name="pre_installation" value="cd $SRCDIR;hg revert -a"/>
81
	<attribute name="patch" value="$SRCDIR/../dce/utils/packet-socket-upgrade-exp.patch;$SRCDIR/../dce/utils/remove-default-simulator-asserts.patch;$SRCDIR/../dce/utils/NS3-shutdown.patch"/>
82
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-tests"/>
74
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-tests"/>
83
      </build>
75
      </build>
84
    </module>
76
    </module>
85
77
86
    <module name="git-kern">
87
      <source type="git">
88
	<attribute name="url" value="git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git"/>
89
	<attribute name="revision" value="fed66381d65a35198639f564365e61a7f256bf79"/>
90
      </source>
91
      <build type="none" objdir="no">
92
      </build>
93
    </module>
94
95
    <module name="ns-3-linux" built_once="true">
78
    <module name="ns-3-linux" built_once="true">
96
      <source type="mercurial">
79
      <source type="mercurial">
97
	<attribute name="url" value="http://code.nsnam.org/furbani/ns-3-linux"/>
80
	<attribute name="url" value="http://code.nsnam.org/furbani/ns-3-linux"/>
98
      </source>
81
      </source>
99
      <depends_on name="git-kern" optional="False"/>
100
      <build type="make" objdir="no">
82
      <build type="make" objdir="no">
101
	<attribute name="pre_installation" value="ln -s ../git-kern net-next-2.6; sed 's/$(PWD)/$SRCDIR/' Makefile >a; mv a Makefile; make unpatch; make setup ;make defconfig; make config; sed s/CONFIG_PACKET=m/CONFIG_PACKET=y/ config >c2 ; mv c2 config"/>
83
        <attribute name="install_arguments" value="INSTALL_DIR=$INSTALLDIR"/>
84
        <attribute name="post_installation" value="cd $INSTALLDIR/bin_dce ; ln -s ../lib/libnet-next-2.6.so liblinux.so; ln -s ../lib/libnet-next-2.6.so"/>
102
      </build>
85
      </build>
103
    </module>
86
    </module>
104
87
88
    <!-- quagga related modules -->
89
    <module name="dce-quagga">
90
      <source type="mercurial">
91
	<attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-quagga"/>
92
 	<attribute name="module_directory" value="dce-quagga/"/>
93
      </source>
94
       <depends_on name="dce-ns3" optional="False"/>
95
       <depends_on name="quagga" optional="False"/>
96
       <depends_on name="iputils" optional="False"/>
97
      <build type="waf" objdir="build">
98
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR"/>
99
     </build>
100
    </module>
101
102
     <module name="quagga">
103
       <source type="archive">
104
	 <!-- some of mirror sever of gnu.org isn't available.. -->
105
	 <!-- attribute name="url" value="http://download.savannah.gnu.org/releases/quagga/quagga-0.99.20.tar.gz"/ -->
106
	 <attribute name="url" value="http://pkgs.fedoraproject.org/lookaside/pkgs/quagga/quagga-0.99.20.tar.gz/64cc29394eb8a4e24649d19dac868f64/quagga-0.99.20.tar.gz"/>
107
	 <attribute name="extract_directory" value="quagga-0.99.20"/>
108
       </source>
109
       <build type="make" objdir="yes">
110
	 <attribute name="pre_installation" value="cd $SRCDIR; CFLAGS='-fPIC -g' LDFLAGS=-pie ./configure --disable-shared --enable-static --disable-user --disable-group --disable-capabilities --prefix=$INSTALLDIR"/>
111
         <attribute name="install_arguments" value="-n" />
112
         <attribute name="post_installation" value="cd $SRCDIR; mkdir $INSTALLDIR/bin_dce; /bin/cp zebra/zebra $INSTALLDIR/bin_dce;/bin/cp ripd/ripd $INSTALLDIR/bin_dce;/bin/cp ripngd/ripngd $INSTALLDIR/bin_dce;/bin/cp ospfd/ospfd $INSTALLDIR/bin_dce;/bin/cp ospf6d/ospf6d $INSTALLDIR/bin_dce;/bin/cp bgpd/bgpd $INSTALLDIR/bin_dce"/>
113
       </build>
114
     </module>
115
116
     <module name="iputils">
117
       <source type="archive">
118
	 <attribute name="url" value="http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2"/>
119
       </source>
120
       <!-- note: iputils does not have 'make install' -->
121
       <build type="inline"  classname="IputilsModuleBuild">
122
	 <attribute name="supported_os" value="linux;linux2"/>
123
	 <code>class IputilsModuleBuild(InlineModuleBuild):
124
    def __init__(self):
125
        InlineModuleBuild.__init__(self)
126
    def build(self, env, jobs):
127
           env.run(['patch', '-p1', '-f', '-i', env.srcdir + '/../dce-quagga/utils/iputils-ping6.patch'],
128
           directory=env.srcdir)
129
           env.run(['make', 'CFLAGS=-fpic', 'CFLAGS+=-D_GNU_SOURCE', 'CFLAGS+=-g',
130
           'CFLAGS+=-Wstrict-prototypes', 'CFLAGS+=-Wall', 'LDFLAGS=-pie', 
131
           'ping', 'ping6', '-j', str(jobs)],
132
           directory=env.srcdir)
133
           env.run(['mkdir', '-p' , env.installdir + '/bin_dce/'],
134
           directory=env.srcdir)
135
           env.run(['cp', 'ping', 'ping6', env.installdir + '/bin_dce'],
136
           directory=env.srcdir)
137
    def clean(self, env):
138
           env.run(['make', 'clean'], directory=env.srcdir)
139
    def check_version(self, env):
140
           return True</code>
141
       </build>
142
     </module>
143
144
     <!-- umip related modules -->
145
    <module name="dce-umip">
146
      <source type="mercurial">
147
	<attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-umip"/>
148
	<attribute name="module_directory" value="dce-umip/"/>
149
      </source>
150
       <depends_on name="dce-linux" optional="False"/>
151
       <depends_on name="dce-quagga" optional="False"/>
152
       <depends_on name="umip" optional="False"/>
153
      <depends_on name="ns-3-dev-dce-umip" optional="False"/>
154
      <build type="waf" objdir="build">
155
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR"/>
156
     </build>
157
    </module>
158
159
   <module name="ns-3-dev-dce-umip">
160
      <source type="none">
161
 	<attribute name="module_directory" value="ns-3-dev-dce/"/>
162
      </source>
163
      <depends_on name="ns-3-dev-dce" optional="False"/>
164
      <build type="waf" objdir="yes">
165
	<attribute name="patch" value="$SRCDIR/../dce-umip/utils/ipv6-opt-header.patch"/>
166
	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-tests"/>
167
      </build>
168
    </module>
169
170
     <module name="umip">
171
       <source type="git">
172
         <attribute name="url" value="git://git.umip.org/umip.git"/>
173
       </source>
174
       <build type="autotools" objdir="no">
175
         <attribute name="maintainer" value="yes" />
176
         <attribute name="configure_arguments" value="./configure CFLAGS=-fPIC  LDFLAGS=-pie --prefix=$INSTALLDIR --enable-vt --with-builtin-crypto"/>
177
         <attribute name="install_arguments" value="-n" />
178
         <attribute name="post_installation" value="cd $SRCDIR; mkdir $INSTALLDIR/bin_dce; /bin/cp -f src/mip6d  $INSTALLDIR/bin_dce"/>
179
       </build>
180
     </module>
181
105
    <module name="click">
182
    <module name="click">
106
      <source type="git">
183
      <source type="git">
107
	<attribute name="url" value="git://read.cs.ucla.edu/git/click"/>
184
	<attribute name="url" value="git://read.cs.ucla.edu/git/click"/>
 Lines 222-229    Link Here 
222
	<attribute name="url" value="http://code.nsnam.org/mathieu/elf-loader"/>
299
	<attribute name="url" value="http://code.nsnam.org/mathieu/elf-loader"/>
223
      </source>
300
      </source>
224
      <build type="make" objdir="no">
301
      <build type="make" objdir="no">
225
	<attribute name="patch" value="$SRCDIR/../dce/utils/elf-loader-r633.patch"/>
226
	<attribute name="configure_arguments" value="vdl-config.h"/>
302
	<attribute name="configure_arguments" value="vdl-config.h"/>
303
	<attribute name="install_arguments" value="PREFIX=$INSTALLDIR"/>
227
      </build>
304
      </build>
228
    </module>
305
    </module>
229
306

Return to bug 1591