Update

.github/workflows/linux.yml

@@ -0,0 +1,70 @@
+name: Linux
+
+on: [push]
+
+jobs:
+  debug-unit_tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        config:
+          - {
+              id: 'ubuntu-22.04-qt6',
+              name: "Ubuntu 22.04",
+              docker_image: "fwbuilder/ubuntu:22.04",
+              unit_tests: true,
+              qt6: true,
+            }
+          - {
+              id: 'ubuntu-22.04-qt5',
+              name: "Ubuntu 22.04",
+              docker_image: "fwbuilder/ubuntu:22.04",
+              unit_tests: true,
+              qt6: false,
+            }
+#          - {
+#              id: 'ubuntu-20.04',
+#              name: "Ubuntu 20.04",
+#              docker_image: "fwbuilder/ubuntu:20.04",
+#              unit_tests: true,
+#              qt6: false,
+#            }
+#          - {
+#              id: 'ubuntu-18.04',
+#              name: "Ubuntu 18.04",
+#              docker_image: "fwbuilder/ubuntu:18.04",
+#              unit_tests: true,
+#              qt6: false,
+#            }
+    container:
+      image: ${{ matrix.config.docker_image }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Compilation cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.ccache
+          key: ${{ matrix.config.id }}-ccache-${{ github.sha }}
+          restore-keys: |
+            ${{ matrix.config.id }}-ccache
+      - name: Configure (Qt6)
+        if: ${{ matrix.config.qt6 == true }}
+        run: |
+          mkdir -p build && cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Debug -DUseQt6=ON
+      - name: Configure (Qt5)
+        if: ${{ matrix.config.qt6 == false }}
+        run: |
+          mkdir -p build && cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Debug
+      - name: Build
+        run: |
+          cd build
+          make -j$(nproc)
+          make install
+      - name: Run unit tests
+        if: ${{ matrix.config.unit_tests == true }}
+        run: |
+          cd build
+          QT_QPA_PLATFORM=vnc ctest --verbose

.github/workflows/macos.yml

@@ -0,0 +1,33 @@
+name: macOS
+
+on: [push]
+
+jobs:
+  release-build:
+    runs-on: macos-10.15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          brew install qt net-snmp ccache
+          brew upgrade openssl cmake
+      - name: Compilation cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.ccache
+          key: ${{ runner.os }}-ccache-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-ccache
+      - name: Configure
+        run: |
+          export PATH="/usr/local/opt/qt/bin:/usr/local/opt/net-snmp/bin:$PATH"
+          export OPENSSL_ROOT_DIR="/usr/local/opt/openssl" ;
+          mkdir -p build && cd build
+          cmake ..
+      - name: Build
+        run: |
+          export PATH="/usr/local/opt/qt/bin:/usr/local/opt/net-snmp/bin:$PATH"
+          export OPENSSL_ROOT_DIR="/usr/local/opt/openssl" ;
+          cd build
+          make -j$(sysctl -n hw.ncpu) install

.github/workflows/w32-mxe.yml

@@ -0,0 +1,37 @@
+name: w32-mxe
+
+on: [push]
+
+jobs:
+  release-build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        config:
+          - {
+              id: "mxe-qt-5.15",
+              name: "MXE Qt 5.15",
+              docker_image: "fwbuilder/mxe:qt-5.15"
+            }
+    container:
+      image: ${{ matrix.config.docker_image }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Compilation cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.ccache
+          key: ${{ matrix.config.id }}-ccache-${{ github.sha }}
+          restore-keys: |
+            ${{ matrix.config.id }}-ccache
+      - name: Configure
+        run: |
+          export PATH=$PATH:/opt/mxe/usr/bin
+          mkdir -p build && cd build
+          i686-w64-mingw32.shared-cmake ..
+      - name: Build
+        run: |
+          export PATH=$PATH:/opt/mxe/usr/bin
+          cd build
+          make -j$(nproc)

.gitignore

@@ -26,12 +26,10 @@ ltmain.sh
 configure
 libtool
 qmake.inc
-config.h
 .obj
 .moc
 .ui
 qtdbus_test
-fwbedit
 qrc_MainRes.cpp
 fwb_iosacl
 fwb_nxosacl
@@ -49,11 +47,15 @@ src/unit_tests/*/*Test
 src/unit_tests/*/*Tests
 src/unit_tests/*/*.output
 src/unit_tests/generatedScriptTests*/generatedScriptTests*
-src/unit_tests/generatedScriptTestsSecuwall/ref.*
 src/unit_tests/generatedScriptTestsSecuwall/secuwall-1/
 src/unit_tests/generatedScriptTestsSecuwall/secuwall-2/
 *.pro.user
 src/libfwbuilder/etc/fwbuilder.dtd
 src/res/objects_init.xml
 src/res/templates.xml
-VERSION.h
+default/
+debug/
+release/
+*.qbs.user
+build/
+CMakeLists.txt.user

CMakeLists.txt

@@ -0,0 +1,125 @@
+cmake_minimum_required(VERSION 3.5)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
+    CACHE STRING "Minimum macOS deployment version"
+)
+
+find_program(CCACHE_PROGRAM ccache)
+if(CCACHE_PROGRAM)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+endif()
+
+project(firewallbuilder LANGUAGES CXX C)
+
+### Version variables and include file
+
+include(VERSION)
+configure_file("${CMAKE_SOURCE_DIR}/src/version.h.in" "${CMAKE_BINARY_DIR}/src/version.h" @ONLY)
+include_directories(${CMAKE_BINARY_DIR}/src)
+
+### Build type
+
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release CACHE STRING
+        "Choose the type of build, options are: Debug or Release."
+        FORCE)
+endif()
+include( CTest )
+
+### Dependencies
+
+option(UseQt6 "Use Qt6" OFF)
+if (UseQt6)
+    find_package(Qt6 COMPONENTS Widgets Network PrintSupport REQUIRED)
+else()
+    find_package(Qt5Widgets REQUIRED)
+    find_package(Qt5Network REQUIRED)
+    find_package(Qt5PrintSupport REQUIRED)
+endif()
+
+find_package(LibXml2 REQUIRED)
+find_package(LibXslt REQUIRED)
+
+find_package(NetSNMP)
+if(NETSNMP_FOUND)
+    add_definitions(-DHAVE_LIBSNMP -DNET_SNMP -DHAVE_SNPRINT_OBJID)
+endif()
+
+### Compiler options
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CXX_DEFAULT_FLAGS # clang/GCC warnings
+	$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra;-Werror;-Wno-overloaded-virtual>
+                         # MSVC warnings
+    $<$<CXX_COMPILER_ID:MSVC>:/WX;/W4>)
+
+add_definitions(-D__STDC_FORMAT_MACROS)
+
+if(WIN32)
+  #add_definitions(-DIN_LIBXML) # Enable for static build
+  add_definitions(-DWIN32_LEAN_AND_MEAN)
+endif()
+
+### Install
+
+if(APPLE)
+  set(APP_ICON_FILE fwbuilder-macosx.icns)
+  set(APP_ICON "${PROJECT_SOURCE_DIR}/src/gui/${APP_ICON_FILE}")
+  set(APPLICATION_NAME fwbuilder)
+  set(MACOSX_BUNDLE_ICON_FILE ${APP_ICON_FILE})
+  set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_GENERATION})
+  set(MACOSX_BUNDLE_VERSION ${VERSION})
+  set(MACOSX_BUNDLE_LONG_VERSION_STRING ${VERSION})
+  set_source_files_properties(${APP_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
+  set(FWB_INSTALL_DATADIR ${APPLICATION_NAME}.app/Contents/Resources)
+  set(FWB_INSTALL_DOCDIR ${FWB_INSTALL_DATADIR}/doc)
+  set(FWB_INSTALL_BINDIR ${APPLICATION_NAME}.app/Contents/MacOS)
+elseif(WIN32)
+  set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
+  set(FWB_INSTALL_DATADIR release/resources)
+  set(FWB_INSTALL_DOCDIR release/doc)
+  set(FWB_INSTALL_BINDIR release)
+else()
+  include(GNUInstallDirs)
+  set(FWB_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/fwbuilder-${PROJECT_VERSION})
+  set(FWB_INSTALL_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/fwbuilder-${PROJECT_VERSION})
+  set(FWB_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
+endif()
+
+### Sources
+
+add_subdirectory(src/libfwbuilder/src/fwcompiler)
+add_subdirectory(src/libfwbuilder/src/fwbuilder)
+add_subdirectory(src/common)
+add_subdirectory(src/antlr)
+add_subdirectory(src/compiler_lib)
+add_subdirectory(src/cisco_lib)
+add_subdirectory(src/juniper_lib)
+add_subdirectory(src/pflib)
+add_subdirectory(src/iptlib)
+add_subdirectory(src/ipt)
+add_subdirectory(src/pf)
+add_subdirectory(src/ipf)
+add_subdirectory(src/ipfw)
+add_subdirectory(src/iosacl)
+add_subdirectory(src/nxosacl)
+add_subdirectory(src/junosacl)
+add_subdirectory(src/pix)
+add_subdirectory(src/procurve_acl)
+add_subdirectory(src/libgui)
+add_subdirectory(src/import)
+add_subdirectory(src/parsers)
+add_subdirectory(src/gui)
+add_subdirectory(src/fwbedit)
+add_subdirectory(src/libfwbuilder/etc)
+add_subdirectory(src/libfwbuilder/migration)
+add_subdirectory(src/res)
+add_subdirectory(doc)
+add_subdirectory(src/unit_tests)
+
+### Packaging
+add_subdirectory(packaging)

README.md

@@ -1,4 +1,6 @@
-[![Build Status](https://travis-ci.org/fwbuilder/fwbuilder.svg?branch=master)](https://travis-ci.org/fwbuilder/fwbuilder)
+[![Linux](https://github.com/fwbuilder/fwbuilder/workflows/Linux/badge.svg)](https://github.com/fwbuilder/fwbuilder/actions?query=workflow%3ALinux)
+[![macOS](https://github.com/fwbuilder/fwbuilder/workflows/macOS/badge.svg)](https://github.com/fwbuilder/fwbuilder/actions?query=workflow%3AmacOS)
+[![w32-mxe](https://github.com/fwbuilder/fwbuilder/workflows/w32-mxe/badge.svg)](https://github.com/fwbuilder/fwbuilder/actions?query=workflow%3Aw32-mxe)
 
 fwbuilder
 =========
@@ -12,23 +14,22 @@ Installation instructions
 
 Ubuntu
 ---------
-
-The instructions are inspired by the well-meaning but out of date instructions available from the fwbuilder.org website: http://www.fwbuilder.org/4.0/docs/users_guide5/compile_from_source.shtml
-
-run the following apt-get install command to install the compile requirements:
-
 ```
- sudo apt-get install git automake autoconf libtool libxml2-dev libxslt-dev libsnmp-dev qt5-default qttools5-dev-tools
+ sudo apt install git cmake libxml2-dev libxslt-dev libsnmp-dev qt5-default qttools5-dev-tools
  git clone https://github.com/fwbuilder/fwbuilder.git
- cd fwbuilder
- ./autogen.sh
+ mkdir build
+ cd build
+ cmake ../fwbuilder
  make
  sudo make install
 ```
-Then, if you are lucky, you should be able to type
+Note: default destination is /usr/local. This is configurable:
 ```
- fwbuilder &
+ cmake ../fwbuilder -DCMAKE_INSTALL_PREFIX=/usr
 ```
-At the prompt and get it to run. There is also a GUI icon you can use to start the program. 
-
 
+Create deb package
+---------
+```
+debuild -us -uc --lintian-opts --profile debian
+```