opae-sdk: remove ase sim build flag

CMakeLists.txt

@@ -158,9 +158,6 @@ mark_as_advanced(OPAE_BUILD_PYTHON_DIST)
 option(OPAE_ENABLE_MOCK "Enable building of test infrastructure with mock" OFF)
 mark_as_advanced(OPAE_ENABLE_MOCK)
 
-option(OPAE_BUILD_SIM "Enable building of the AFU simulation environment" OFF)
-mark_as_advanced(OPAE_BUILD_SIM)
-
 option(OPAE_BUILD_LIBOPAEVFIO "Enable building of the opaevfio library" ON)
 mark_as_advanced(OPAE_BUILD_LIBOPAEVFIO)
 
@@ -181,11 +178,6 @@ if(OPAE_BUILD_TESTS)
     mark_as_advanced(OPAE_TEST_TAG)
 endif(OPAE_BUILD_TESTS)
 
-if(OPAE_BUILD_SIM)
-    set(OPAE_SIM_TAG "master" CACHE STRING "Desired branch for opae-sim")
-    mark_as_advanced(OPAE_SIM_TAG)
-endif(OPAE_BUILD_SIM)
-
 if (OPAE_BUILD_PLUGIN_VFIO AND NOT OPAE_BUILD_LIBOPAEVFIO)
     message(STATUS
         "Enabling vfio plugin automatically enables libopaevfio")

external/CMakeLists.txt

@@ -117,13 +117,6 @@ endif(OPAE_WITH_SPDLOG)
 #                              PRESERVE_REPOS ${OPAE_PRESERVE_REPOS})
 #endif(OPAE_BUILD_TESTS)
 
-if(OPAE_BUILD_SIM)
-    opae_external_project_add(PROJECT_NAME opae-sim
-                              GIT_URL https://github.com/OPAE/opae-sim.git
-                              GIT_TAG ${OPAE_SIM_TAG}
-                              PRESERVE_REPOS ${OPAE_PRESERVE_REPOS})
-endif(OPAE_BUILD_SIM)
-
 if(OPAE_BUILD_LEGACY)
     opae_external_project_add(PROJECT_NAME opae-legacy
                               GIT_URL https://github.com/OPAE/opae-legacy.git

libraries/libopae-c/CMakeLists.txt

@@ -42,25 +42,3 @@ opae_add_shared_library(TARGET opae-c
     SOVERSION ${OPAE_VERSION_MAJOR}
     COMPONENT opaeclib
 )
-
-if(OPAE_BUILD_SIM)
-set(SRC_ASE
-    pluginmgr.c
-    api-shell.c
-    init.c
-    init_ase.c
-    props.c
-)
-
-opae_add_shared_library(TARGET opae-c-ase
-    SOURCE ${SRC_ASE}
-    LIBS
-        dl
-        ${CMAKE_THREAD_LIBS_INIT}
-        ${libjson-c_LIBRARIES}
-        ${libuuid_LIBRARIES}
-    VERSION ${OPAE_VERSION}
-    SOVERSION ${OPAE_VERSION_MAJOR}
-    COMPONENT opaecsimlib
-)
-endif(OPAE_BUILD_SIM)

opae.spec.in

@@ -1,5 +1,4 @@
 # -*- rpm-spec -*-
-%define with_ase "@OPAE_BUILD_SIM@"
 
 BuildRoot:      %_topdir/@CPACK_PACKAGE_FILE_NAME@
 
@@ -12,9 +11,7 @@ Group:          @CPACK_META_GROUP_NAME@
 Vendor:         @CPACK_PACKAGE_VENDOR@
 Prefix:         @CMAKE_INSTALL_PREFIX@
 Requires:       opae-libs , opae-devel , opae-tools, opae-tools-extra
-%if %with_ase == "ON"
-Requires:       opae-ase
-%endif
+
 Source0:        @CPACK_PACKAGE_NAME@.tar.gz
 
 %description
@@ -58,16 +55,6 @@ Prefix:     @CPACK_RPM_RELOCATION_PATHS@
 %description tools-extra
 This package contains OPAE extra tools binaries
 
-%if %with_ase == "ON"
-%package ase
-Summary:    OPAE AFU Simulation Environment
-Group:      ase
-Requires:   opae-libs , opae-devel
-
-%description ase
-This package contains OPAE AFU Simulation Environment
-%endif
-
 %package tests
 Summary:    OPAE tests package
 Group:      tests
@@ -238,19 +225,6 @@ ldconfig
 # coreidle applies only to a legacy platform that is no longer supported
 %exclude @CMAKE_INSTALL_PREFIX@/bin/coreidle
 
-%if %with_ase == "ON"
-%files ase
-%license @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DOCDIR@/LICENSE
-%defattr(-,root,root,-)
-@CMAKE_INSTALL_PREFIX@/bin/afu_sim_setup
-@CMAKE_INSTALL_PREFIX@/bin/with_ase
-@CMAKE_INSTALL_PREFIX@/@OPAE_LIB_INSTALL_DIR@/libase*
-@CMAKE_INSTALL_PREFIX@/@OPAE_LIB_INSTALL_DIR@/libopae-c-ase*
-%dir @CMAKE_INSTALL_PREFIX@/share/opae
-%dir @CMAKE_INSTALL_PREFIX@/share/opae/ase/
-%dir @CMAKE_INSTALL_PREFIX@/share/opae/ase/*
-@CMAKE_INSTALL_PREFIX@/share/opae/ase/*
-%endif
 
 %files tests
 %defattr(-,root,root,-)

samples/CMakeLists.txt

@@ -59,9 +59,6 @@ endif()
 ######################################################################
 # Client application #################################################
 ######################################################################
-if(OPAE_BUILD_SIM)
-  add_definitions(-DTEST_TIMEOUT=130000000)
-endif(OPAE_BUILD_SIM)
 
 opae_add_subdirectory(hello_fpga)
 opae_add_subdirectory(hello_events)

scripts/cover.sh

@@ -11,8 +11,7 @@ if [ ! -f CMakeCache.txt ]; then
              -DCMAKE_BUILD_TYPE=Coverage \
              -DOPAE_BUILD_LIBOPAE_CXX=ON \
              -DOPAE_BUILD_TESTS=ON \
-             -DOPAE_ENABLE_MOCK=ON \
-             -DOPAE_BUILD_SIM=OFF
+             -DOPAE_ENABLE_MOCK=ON
 fi
 
 mkdir -p coverage_files

scripts/unit-tests.sh

@@ -11,8 +11,7 @@ if [ ! -f CMakeCache.txt ]; then
              -DCMAKE_BUILD_TYPE=Debug \
              -DOPAE_BUILD_LIBOPAE_CXX=ON \
              -DOPAE_BUILD_TESTS=ON \
-             -DOPAE_ENABLE_MOCK=ON \
-             -DOPAE_BUILD_SIM=OFF
+             -DOPAE_ENABLE_MOCK=ON
 fi
 
 make -j $(nproc)