fixed with-ui merge

build/environment.sh

@@ -18,3 +18,4 @@ else
     rm -f ./third_party/include/QtWidgets
 	ln -s -f $QTDIR/lib/QtWidgets.framework/Headers ./third_party/include/QtWidgets
 fi
+fi

configure.sh

@@ -57,7 +57,7 @@ fi
 export GYP_GENERATORS=$generator 
 export GYPDEFS="-Dqtdir=$QTDIR -Dwith_ui=$gyp_ui"
 
-"./build/bin/gyp" -Dcwd=`pwd` $gypfile --toplevel-dir=`pwd` --depth=0
+"./build/bin/gyp" -Dcwd=`pwd` $GYPDEFS $gypfile --toplevel-dir=`pwd` --depth=0
 result=$?
 
 

qt_generate.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+mkdir -p "$PWD/out/generated"
+
+input_dir="$PWD/src"
+output_dir="$PWD/out/generated"
+
+echo "Generate QT files: $input_dir"
+
+find $input_dir -name '*.h' | xargs grep -l 'Q_OBJECT' | sed 's/\.h$//' | while read f; do
+    output_file="${output_dir}/moc_$(basename $f).cpp"
+    if ! test -f ${output_file} || test $f.h -nt ${output_file}; then
+    	$QTDIR/bin/moc -o ${output_file} $f.h
+    fi
+done
+
+find $input_dir -name '*.ui' | sed -e 's/\.ui$//' | while read f; do
+	output_file="${output_dir}/ui_$(basename $f).h"
+    if ! test -f ${output_file} || test $f.ui -nt ${output_file}; then
+    	$QTDIR/bin/uic -o ${output_file} $f.ui
+    fi
+done
+
+find $input_dir -name '*.qrc' | sed -e 's/\.qrc$//' | while read f; do
+    output_file="${output_dir}/qrc_$(basename $f).cpp"
+    $QTDIR/bin/rcc -o ${output_file} $f.qrc -name $(basename $f)
+done

src/XMUtil.cpp

@@ -112,36 +112,12 @@ int main(int argc, char* argv[])
 	   // connections try to put them in the right place
 	   m->AttachStragglers();
 
-
-
 	   boost::filesystem::path p(argv[1]);
 	   p.replace_extension(".xmile");
 
 	   std::vector<std::string> errs;
 	   m->WriteToXMILE(p.string(), errs);
 
-	   BOOST_FOREACH(const std::string& err, errs)
-	   {
-		   std::cout << err << std::endl;
-	   }
-
-        // mark variable types and potentially convert INTEG equations involving expressions
-        // into flows (a single net flow on the first pass though this)
-        m->MarkVariableTypes();
-
-        // if there is a view then try to make sure everything is defined in the views
-        // put unknowns in a heap in the first view at 20,20 but for things that have
-        // connections try to put them in the right place
-        m->AttachStragglers();
-
-
-
-        boost::filesystem::path p(argv[1]);
-        p.replace_extension(".xmile");
-
-        std::vector<std::string> errs;
-        m->WriteToXMILE(p.string(), errs);
-
         BOOST_FOREACH(const std::string& err, errs)
         {
             std::cout << err << std::endl;
@@ -160,6 +136,7 @@ int main(int argc, char* argv[])
     window.show();
 
     ret = app.exec();
+#endif
     delete m ;
     CloseUCaseMap() ;
    //CheckMemoryTrack(1) ;