Skip to content

Commit

Permalink
Some minor cleaning up.
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed Dec 6, 2020
1 parent 7e84748 commit 88e25f6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions scripts/genericclean
Expand Up @@ -6,12 +6,12 @@ else
echo "\033[44;37;1mCleaning OpenCOR...\033[0m"
fi

appDir="$(cd "$(dirname "$0")"; pwd)"/..
appDir=$(cd $(dirname $0); pwd)/..

rm -fr ${appDir}/build/.clang-tidy ${appDir}/build/.ninja* ${appDir}/build/* > /dev/null 2>&1
rm -fr $appDir/build/.clang-tidy $appDir/build/.ninja* $appDir/build/* > /dev/null 2>&1

if [ "$1" = "all" ]; then
rm -fr ${appDir}/ext/* > /dev/null 2>&1
rm -fr $appDir/ext/* > /dev/null 2>&1
fi

echo "\033[42;37;1mAll done!\033[0m"
10 changes: 5 additions & 5 deletions scripts/genericclean.bat
Expand Up @@ -9,21 +9,21 @@ IF "%1" == "all" (
SET AppDir=%~dp0..\
SET OrigDir=%CD%

IF EXIST "%AppDir%build" (
CD "%AppDir%build"
IF EXIST %AppDir%build (
CD %AppDir%build

FOR %%I IN (*.*) DO ATTRIB -R "%%I"
FOR /D %%I IN (*.*) DO RMDIR /S /Q "%%I"
FOR %%I IN (*.*) DO IF NOT "%%I" == ".gitignore" DEL /Q "%%I"
)

IF "%1" == "all" (
IF EXIST "%AppDir%ext" (
CD "%AppDir%ext"
IF EXIST %AppDir%ext (
CD %AppDir%ext

FOR /D %%I IN (*.*) DO RMDIR /S /Q "%%I"
FOR %%I IN (*.*) DO IF NOT "%%I" == ".gitignore" DEL /Q "%%I"
)
)

CD "%OrigDir%"
CD %OrigDir%
6 changes: 3 additions & 3 deletions scripts/genericmake
@@ -1,8 +1,8 @@
#!/bin/sh

appDir="$(cd "$(dirname "$0")"; pwd)"/..
appDir=$(cd $(dirname $0); pwd)/..

if [ -d "${appDir}/build" ]; then
if [ -d $appDir/build ]; then
if [ "$1" = "Release" ]; then
cmakeBuildType=Release
enableSamplePlugins=OFF
Expand Down Expand Up @@ -47,7 +47,7 @@ if [ -d "${appDir}/build" ]; then

origDir=`pwd`

cd ${appDir}/build
cd $appDir/build

cmake -G "$cmakeGenerator" -DCMAKE_BUILD_TYPE=$cmakeBuildType -DENABLE_SAMPLE_PLUGINS=$enableSamplePlugins -DENABLE_TEST_PLUGINS=$enableTestPlugins -DENABLE_TESTS=$enableTests ..

Expand Down
4 changes: 2 additions & 2 deletions scripts/genericmake.bat
Expand Up @@ -2,7 +2,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION

SET AppDir=%~dp0..\

IF EXIST "%AppDir%build" (
IF EXIST %AppDir%build (
IF "%1" == "Release" (
SET CMakeBuildType=Release
SET EnableSamplePlugins=OFF
Expand Down Expand Up @@ -47,7 +47,7 @@ IF EXIST "%AppDir%build" (

SET OrigDir=%CD%

CD "%AppDir%build"
CD %AppDir%build

IF DEFINED NinjaFound (
SET CMakeGenerator=Ninja
Expand Down

0 comments on commit 88e25f6

Please sign in to comment.