Remove DOC-features and the Elude model (#325)

* Removing all DOC features and the Elide model * corrected directory structure in windows for triggered builds * Removing DOC test cases * Removing virtualization of PSM descriptor functions.
percolator · Apr 28, 2022 · 74a8b15 · 74a8b15
1 parent 6523e31
commit 74a8b15
Show file tree

Hide file tree

Showing 113 changed files with 52 additions and 635,029 deletions.
diff --git a/.github/workflows/triggered_build.yml b/.github/workflows/triggered_build.yml
@@ -77,7 +77,7 @@ jobs:
         ECHO %base_dir%
         CALL percolator\admin\builders\nativew64_build.bat -s %base_dir% -r %base_dir%\my_rel -b %base_dir%\my_build
     - name: zip raw binary
-      run: TAR -czvf my_rel\percolator-noxml.tgz my_build\percolator-noxml\src\Release\percolator.exe
+      run: CD .. || TAR -czvf my_rel\percolator-noxml.tgz my_build\percolator-noxml\src\Release\percolator.exe
     - name: Upload packages
       uses: actions/upload-artifact@v3
       with:

diff --git a/admin/builders/actionsw64_build.bat b/admin/builders/actionsw64_build.bat
@@ -204,16 +204,6 @@ msbuild PACKAGE.vcxproj /p:Configuration=%BUILD_TYPE% /m
 ::msbuild INSTALL.vcxproj /p:VCTargetsPath="%VCTARGET%" /p:Configuration=%BUILD_TYPE% /m
 ::msbuild RUN_TESTS.vcxproj /p:VCTargetsPath="%VCTARGET%" /p:Configuration=%BUILD_TYPE% /m
 
-::::: Building elude :::::::
-if not exist "%BUILD_DIR%\elude" (md "%BUILD_DIR%\elude")
-cd /D "%BUILD_DIR%\elude"
-echo cmake elude.....
-cmake.exe -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIB%" "%SRC_DIR%\percolator\src\elude_tool"
-echo build elude (this will take a few minutes).....
-msbuild PACKAGE.vcxproj /p:Configuration=%BUILD_TYPE% /m
-
-::msbuild INSTALL.vcxproj /p:VCTargetsPath="%VCTARGET%" /p:Configuration=%BUILD_TYPE% /m
-::msbuild RUN_TESTS.vcxproj /p:VCTargetsPath="%VCTARGET%" /p:Configuration=%BUILD_TYPE% /m
 
 :::::::::::::::::::::::::::::::::::::::
 :::::::::::: END BUILD ::::::::::::::::
@@ -226,8 +216,6 @@ xcopy "%BUILD_DIR%\percolator\per*.exe" "%RELEASE_DIR%"
 set /A exit_code=exit_code+%ERRORLEVEL%
 xcopy "%BUILD_DIR%\converters\per*.exe" "%RELEASE_DIR%"
 set /A exit_code=exit_code+%ERRORLEVEL%
-xcopy "%BUILD_DIR%\elude\elude*.exe" "%RELEASE_DIR%"
-set /A exit_code=exit_code+%ERRORLEVEL%
 
 echo Finished buildscript execution in build directory %BUILD_DIR%
 

diff --git a/admin/builders/centos64_build.sh b/admin/builders/centos64_build.sh
@@ -112,14 +112,6 @@ cmake -DTARGET_ARCH=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/us
 make -j 4
 make -j 4 package
 
-mkdir -p ${build_dir}/elude
-cd ${build_dir}/elude
-(set -x; \
-cmake -DTARGET_ARCH=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH="${build_dir}/${centos_boost}" ${src_dir}/percolator/src/elude_tool; \
-)
-make -j 4
-make -j 4 package
-
 echo "build directory was : ${build_dir}"
 
-cp -v ${build_dir}/{percolator-noxml,percolator,converters,elude}/*.rpm ${release_dir}
+cp -v ${build_dir}/{percolator-noxml,percolator,converters}/*.rpm ${release_dir}
diff --git a/admin/builders/fedora64_build.sh b/admin/builders/fedora64_build.sh
@@ -55,13 +55,7 @@ cmake -DTARGET_ARCH=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/us
 make -j 4;
 make -j 4 package;
 
-mkdir -p ${build_dir}/elude
-cd ${build_dir}/elude
-cmake -DTARGET_ARCH=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ${src_dir}/percolator/src/elude_tool
-make -j 4;
-make -j 4 package;
-
 echo "build directory was : ${build_dir}";
 
-cp -v ${build_dir}/{percolator-noxml,percolator,converters,elude}/*.rpm ${release_dir};
+cp -v ${build_dir}/{percolator-noxml,percolator,converters}/*.rpm ${release_dir};
 
diff --git a/admin/builders/nativew32_build.bat b/admin/builders/nativew32_build.bat
@@ -137,7 +137,7 @@ if not exist "%ZLIB_DIR%" (
 set ZLIB_DIR=%ZLIB_DIR%;%ZLIB_DIR%\include
 set PATH=%PATH%;%ZLIB_DIR%
 
-::: needed for Elude :::
+::: needed for  :::
 set DIRENT_H_PATH=%VCToolsInstallDir%\include\dirent.h
 if not exist "%DIRENT_H_PATH%" (
   echo Downloading and installing dirent.h
@@ -185,14 +185,6 @@ echo cmake converters.....
 echo build converters (this will take a few minutes).....
 msbuild PACKAGE.vcxproj /p:Configuration=%BUILD_TYPE% /m
 
-::::::: Building elude ::::::: 
-if not exist "%BUILD_DIR%\elude" (md "%BUILD_DIR%\elude")
-cd /D "%BUILD_DIR%\elude"
-echo cmake elude.....
-%CMAKE_EXE% -G "Visual Studio %MSVC_VER%" -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIB%" "%SRC_DIR%\percolator\src\elude_tool"
-echo build elude (this will take a few minutes).....
-msbuild PACKAGE.vcxproj /p:Configuration=%BUILD_TYPE% /m
-
 :::::::::::::::::::::::::::::::::::::::
 :::::::::::: END BUILD ::::::::::::::::
 :::::::::::::::::::::::::::::::::::::::
@@ -202,7 +194,6 @@ set /A exit_code=0
 call :copytorelease "%BUILD_DIR%\percolator-noxml\per*.exe"
 call :copytorelease "%BUILD_DIR%\percolator\per*.exe"
 call :copytorelease "%BUILD_DIR%\converters\per*.exe"
-call :copytorelease "%BUILD_DIR%\elude\elude*.exe"
 
 echo Finished buildscript execution in build directory %BUILD_DIR%
 

diff --git a/admin/builders/nativew64_build.bat b/admin/builders/nativew64_build.bat
@@ -194,14 +194,6 @@ echo cmake converters.....
 echo build converters (this will take a few minutes).....
 msbuild PACKAGE.vcxproj /p:Configuration=%BUILD_TYPE% /m
 
-::::: Building elude :::::::
-if not exist "%BUILD_DIR%\elude" (md "%BUILD_DIR%\elude")
-cd /D "%BUILD_DIR%\elude"
-echo cmake elude.....
-%CMAKE_EXE% -G "Visual Studio %MSVC_VER%" -A x64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIB%" "%SRC_DIR%\percolator\src\elude_tool"
-echo build elude (this will take a few minutes).....
-msbuild PACKAGE.vcxproj /p:Configuration=%BUILD_TYPE% /m
-
 :::::::::::::::::::::::::::::::::::::::
 :::::::::::: END BUILD ::::::::::::::::
 :::::::::::::::::::::::::::::::::::::::
@@ -211,7 +203,6 @@ set /A exit_code=0
 call :copytorelease "%BUILD_DIR%\percolator-noxml\per*.exe"
 call :copytorelease "%BUILD_DIR%\percolator\per*.exe"
 call :copytorelease "%BUILD_DIR%\converters\per*.exe"
-call :copytorelease "%BUILD_DIR%\elude\elude*.exe"
 
 echo Finished buildscript execution in build directory %BUILD_DIR%
 

diff --git a/admin/builders/osx64_build.sh b/admin/builders/osx64_build.sh
@@ -166,15 +166,8 @@ cd ${build_dir}/converters
 cmake -DTARGET_ARCH="x86_64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local/ -DCMAKE_PREFIX_PATH="${build_dir}/${mac_os_xerces}/;${build_dir}/${mac_os_xsd}/;/opt/local/;/usr/;/usr/local/;~/;/Library/Developer/CommandLineTools/usr/" -DSERIALIZE="TokyoCabinet" ${src_dir}/percolator/src/converters
 make -j 2
 make -j 2 package
-
-mkdir -p ${build_dir}/elude
-cd ${build_dir}/elude
-
-cmake -DTARGET_ARCH="x86_64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local/ -DCMAKE_PREFIX_PATH="${build_dir}/${mac_os_xsd}/;/opt/local/;/usr/;/usr/local/;~/;/Library/Developer/CommandLineTools/usr/" ${src_dir}/percolator/src/elude_tool
-make -j 2
-make -j 2 package
 #--------------------------------------------
 
 echo "build directory was : ${build_dir}";
 
-cp -v ${build_dir}/{percolator-noxml,percolator,converters,elude}/*.pkg ${release_dir};
+cp -v ${build_dir}/{percolator-noxml,percolator,converters}/*.pkg ${release_dir};
diff --git a/admin/builders/ubuntu64_build.sh b/admin/builders/ubuntu64_build.sh
@@ -89,7 +89,7 @@ sudo apt-get -y install libboost-dev libboost-filesystem-dev xsdcxx;
 sudo apt-get -y install libboost-system-dev libboost-thread-dev libsqlite3-dev libtokyocabinet-dev zlib1g-dev libbz2-dev;
 
 #------------------------------------------------------------------------
-mkdir -p $build_dir/percolator-noxml $build_dir/percolator $build_dir/converters $build_dir/elude;
+mkdir -p $build_dir/percolator-noxml $build_dir/percolator $build_dir/converters;
 
 ######percolator########
 #-----cmake-----
@@ -127,22 +127,10 @@ echo "make converters (this will take few minutes).....";
 make -j 4;
 make -j 4 package;
 
-#######elude########
-cd $build_dir/elude
-#-----cmake-----
-echo "cmake elude.....";
-(set -x; 
-cmake -DTARGET_ARCH=amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release $src_dir/percolator/src/elude_tool;
-)
-#-----make------
-echo "make elude (this will take few minutes).....";
-
-make -j 4;
-make -j 4 package;
 
 ###########################
 
 echo "Finished buildscript execution";
 echo "in build directory ${build_dir}";
 
-cp -v $build_dir/{percolator-noxml,percolator,converters,elude}/*.deb ${release_dir};
+cp -v $build_dir/{percolator-noxml,percolator,converters}/*.deb ${release_dir};
diff --git a/admin/vagrant/manager.sh b/admin/vagrant/manager.sh
@@ -32,7 +32,6 @@ tmp_src_dir=src/percolator
 git_url=https://github.com/percolator/percolator.git
 package_prefixes=()
 package_prefixes+=(percolator)
-package_prefixes+=(elude)
 
 # Default values:
 current_path=$PWD;