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.

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

merged 4 commits into from
May 11, 2018

Conversation

kekkokk
Copy link
Contributor

@kekkokk kekkokk commented May 11, 2018

Should fix build problems

[] It needs and includes Unit Tests
[] It includes documentation for these changes in /doc.

@@ -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

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

@kekkokk
Copy link
Contributor Author

kekkokk commented May 11, 2018

I think you can merge

@jcague
Copy link
Contributor

jcague commented May 11, 2018

did the file work for you then?

@kekkokk
Copy link
Contributor Author

kekkokk commented May 11, 2018

yeah!

@jcague jcague merged commit 7c5945c into lynckia:master May 11, 2018
@kekkokk kekkokk deleted the fix/build branch May 11, 2018 12:24
@kekkokk kekkokk restored the fix/build branch May 22, 2018 14:23
Arri98 pushed a commit to Arri98/licode that referenced this pull request Apr 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants