Mercurial Mercurial > daniel > bake / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for the configuration file and Unrecognized option draft default tip
authordaniel
Fri, 23 Nov 2012 16:21:59 +0100
changeset 124 8fe5ba0938c6
parent 123 51268e619149
Fix for the configuration file and Unrecognized option
bake/Bake.py file | annotate | diff | comparison | revisions
bakeconf.xml file | annotate | diff | comparison | revisions 
--- a/bake/Bake.py	Fri Nov 23 11:10:58 2012 +0100
+++ b/bake/Bake.py	Fri Nov 23 16:21:59 2012 +0100
@@ -1049,9 +1049,11 @@
                 ['check', self._check],
                 ['distclean', self._distclean],
                ]
+        recognizedCommand = False
         
         for name, function in ops: 
             if args_left[0] == name:
+                recognizedCommand = True
                 if options.debug:
                     function(config=options.config_file, args=args_left[1:])
                 else:
@@ -1060,3 +1062,8 @@
                     except Exception as e:
                         print ('\n'+e.message)
                         sys.exit(1)
+                        
+        if not recognizedCommand:
+            print (' >> Unrecognized option: ' + args_left[0])
+            sys.exit(1)
+           
--- a/bakeconf.xml	Fri Nov 23 11:10:58 2012 +0100
+++ b/bakeconf.xml	Fri Nov 23 16:21:59 2012 +0100
@@ -42,7 +42,7 @@
 	<attribute name="extract_directory" value="ccnx-0.6.2"/>
       </source>
       <build type="make" objdir="yes">
-	<attribute name="pre_installation" value="cd $SRCDIR;INSTALL_BASE=$INSTALLDIR ./configure"/>
+	<attribute name="pre_installation" value="cd $SRCDIR;INSTALL_BASE=$INSTALLDIR ./configure;mkdir $INSTALLDIR/include;mkdir $INSTALLDIR/lib;mkdir $INSTALLDIR/bin"/>
 	<attribute name="build_arguments" value="MORE_LDLIBS=-pie"/>
         <attribute name="new_variable" value="INSTALL_BASE=$INSTALLDIR" />
       </build>
@@ -226,10 +226,33 @@
       <depends_on name="qt4" optional="False"/>
     </module>
 
+  <module name="ns-3-allinone">
+      <source type="mercurial">
+	<attribute name="url" value="http://code.nsnam.org/ns-3-dev"/>
+      </source>
+      <depends_on name="net_anim" optional="True"/>
+      <depends_on name="nsc" optional="True"/>
+      <depends_on name="pybindgen" optional="True"/>
+      <depends_on name="click" optional="True"/>
+      <depends_on name="openflow-ns3" optional="True"/>
+      <build type="waf" objdir="yes">
+	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-examples --enable-tests --with-nsclick=$SRCDIR/click --with-pybindgen=$SRCDIR/pybindgen --with-openflow=$SRCDIR/openflow-ns3 --with-nsc=$SRCDIR/nsc"/>
+      </build>
+  </module>
+
   <module name="ns-3-dev">
       <source type="mercurial">
 	<attribute name="url" value="http://code.nsnam.org/ns-3-dev"/>
       </source>
+      <build type="waf" objdir="yes">
+	<attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-examples --enable-tests"/>
+      </build>
+  </module>
+
+  <module name="ns-3-16">
+      <source type="mercurial">
+	<attribute name="url" value="http://code.nsnam.org/ns-3.16"/>
+      </source>
       <depends_on name="net_anim" optional="True"/>
       <depends_on name="nsc" optional="True"/>
       <depends_on name="pybindgen" optional="True"/>
@@ -265,11 +288,6 @@
 
   <predefined name="ns3-min">
     <enable name="ns-3-dev"/>
-    <disable name="nsc"/>
-    <disable name="net_anim"/>
-    <disable name="pybindgen"/>
-    <disable name="click"/>
-    <disable name="openflow-ns3"/>
     <append module="ns-3-dev" name="configure_arguments" value=" --enable-modules=core,network,wifi"/> -->
   </predefined>
daniel/bake