still working on windows build failure; names for the items in BaseCompiler::termination_status shuld be unique; new build number 3466

VERSION

@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3465"
+BUILD_NUM="3466"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 

VERSION.h

@@ -1,2 +1,2 @@
-#define VERSION      "4.2.0.3465"
+#define VERSION      "4.2.0.3466"
 #define GENERATION   "4.2"

packaging/fwbuilder-static-qt.spec

@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 4.2.0.3465
+%define version 4.2.0.3466
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"

packaging/fwbuilder.control

@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
 Priority: extra
 Section: checkinstall
 Maintainer: vadim@fwbuilder.org
-Version: 4.2.0.3465-1
+Version: 4.2.0.3466-1
 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
 Description: Firewall Builder GUI and policy compilers

packaging/fwbuilder.spec

@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 4.2.0.3465
+%define version 4.2.0.3466
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"

src/cisco_lib/CompilerDriver_iosacl_run.cpp

@@ -378,7 +378,7 @@ QString CompilerDriver_iosacl::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 

src/cisco_lib/CompilerDriver_pix_run.cpp

@@ -535,7 +535,7 @@ QString CompilerDriver_pix::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 

src/cisco_lib/CompilerDriver_procurve_acl_run.cpp

@@ -366,7 +366,7 @@ QString CompilerDriver_procurve_acl::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 

src/iosacl/iosacl.cpp

@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
         
     } catch(libfwbuilder::FWException &ex)
     {

src/ipf/ipf.cpp

@@ -175,7 +175,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex)  {
 	cerr << ex.toString() << endl;

src/ipfw/ipfw.cpp

@@ -171,7 +171,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex)
     {

src/ipt/ipt.cpp

@@ -152,7 +152,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex) 
     {

src/iptlib/CompilerDriver_ipt_run.cpp

@@ -746,7 +746,7 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
     

src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp

@@ -152,7 +152,7 @@ void BaseCompiler::abort(const string &errstr) throw(FWException)
     printError(errstr);
     if (inEmbeddedMode())
         throw FatalErrorInSingleRuleCompileMode(errors_buffer.str());
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     if (test_mode) return;
     throw FWException("Fatal error");
 }
@@ -165,14 +165,14 @@ void BaseCompiler::abort(FWObject *fw,
     message("error", fw, ruleset, rule, errstr);
     if (inEmbeddedMode())
         throw FatalErrorInSingleRuleCompileMode(errors_buffer.str());
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     if (test_mode) return;
     throw FWException("Fatal error");
 }
 
 void BaseCompiler::error(const string &str)
 {
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     printError(str);
 }
 
@@ -181,7 +181,7 @@ void BaseCompiler::error(FWObject *fw,
                          FWObject *rule,
                          const string &errstr)
 {
-    status = ERROR;
+    status = FWCOMPILER_ERROR;
     message("error", fw, ruleset, rule, errstr);
 }
 

src/libfwbuilder/src/fwcompiler/BaseCompiler.h

@@ -75,7 +75,7 @@ namespace fwcompiler {
                      const std::string &errstr);
         
 public:
-        typedef enum {SUCCESS, ERROR} termination_status;
+        typedef enum {FWCOMPILER_SUCCESS, FWCOMPILER_ERROR} termination_status;
 
 protected:
         termination_status status;
@@ -132,7 +132,7 @@ public:
             test_mode = false;
             embedded_mode = false;
             level_macro = "%LEVEL%";
-            status = SUCCESS;
+            status = FWCOMPILER_SUCCESS;
         };
 
 	std::string getErrors(const std::string &comment_sep);

src/pf/pf.cpp

@@ -155,7 +155,7 @@ int main(int argc, char **argv)
         }
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(const FWException &ex)
     {

src/pflib/CompilerDriver_ipf_run.cpp

@@ -416,7 +416,7 @@ QString CompilerDriver_ipf::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
     

src/pflib/CompilerDriver_ipfw_run.cpp

@@ -338,7 +338,7 @@ QString CompilerDriver_ipfw::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 

src/pflib/CompilerDriver_pf_run.cpp

@@ -758,7 +758,7 @@ QString CompilerDriver_pf::run(const std::string &cluster_id,
     }
     catch (FWException &ex)
     {
-        status = BaseCompiler::ERROR;
+        status = BaseCompiler::FWCOMPILER_ERROR;
         return QString::fromUtf8(ex.toString().c_str());
     }
 

src/pix/pix.cpp

@@ -175,7 +175,8 @@ int main(int argc, char **argv)
             driver.compile();
 
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
 
     } catch(libfwbuilder::FWException &ex)
     {

src/procurve_acl/procurve_acl.cpp

@@ -162,7 +162,8 @@ int main(int argc, char **argv)
 
         driver.compile();
         delete objdb;
-        return (driver.getStatus() == BaseCompiler::SUCCESS) ? 0 : 1;
+
+        return (driver.getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
         
     } catch(libfwbuilder::FWException &ex)
     {