Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build script and generation of Eclipse CDT #1215

Merged
merged 4 commits into from
May 11, 2018
Merged

Fix build script and generation of Eclipse CDT #1215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
914ff76
Fix build script and generation of Eclipse CDT
kekkokk May 11, 2018
8ce3034
add release
kekkokk May 11, 2018
c9dc444
modify generateEclipseProject
kekkokk May 11, 2018
de3d7a4
revert buildProject
kekkokk May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions erizo/buildProject.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@
set -e

BIN_DIR="build"
OBJ_DIR="CMakeFiles"

buildAll() {
if [ -d $BIN_DIR ]; then
cd $BIN_DIR
for d in */ ; do
echo "Building $d - $*"
cd $d
make $*
cd ..
for entry in "$BIN_DIR"/*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there anything in the previous version that is not working? I would remove these changes otherwise

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no just a cleaner syntax i think

do
echo "Building directory: $entry with flags $*"
make -C $entry $*
done
cd ..
else
echo "Error, build directory does not exist, run generateProject.sh first"
fi
}



buildAll $*
2 changes: 1 addition & 1 deletion erizo/generateEclipseProject.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BIN_DIR="build"
if [ -d $BIN_DIR ]; then
cd $BIN_DIR
# Set to Debug to be able to debug in Eclipse
cmake -G"Eclipse CDT4 - Unix Makefiles" -D ERIZO_BUILD_TYPE=debug ../src
cmake -G "Eclipse CDT4 - Unix Makefiles" -D ERIZO_BUILD_TYPE=debug ../build/debug
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this line might be wrong... can you try with this version of generateEclipseProject.sh I made by adding the Eclipse label please?

#!/usr/bin/env bash
set -e

SCRIPT=`pwd`/$0
FILENAME=`basename $SCRIPT`
PATHNAME=`dirname $SCRIPT`
BASE_BIN_DIR="build"


generateVersion() {
  echo "generating $1"
  BIN_DIR="$BASE_BIN_DIR/$1"
  if [ -d $BIN_DIR ]; then
    cd $BIN_DIR
  else
    mkdir -p $BIN_DIR
    cd $BIN_DIR
  fi
  cmake ../../src "-DERIZO_BUILD_TYPE=$1" -G"Eclipse CDT4 - Unix Makefiles"
  cd $PATHNAME
}


generateVersion debug

echo "Done"
cd ..
else
Expand Down