Add options to erizo build process #1028
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jcague
reviewed
Sep 15, 2017
extras/basic_example/basicServer.js
Outdated
| @@ -191,7 +191,7 @@ app.use(function(req, res, next) { | |||
| cleanExampleRooms(function() { | |||
| getOrCreateRoom(defaultRoomName, undefined, function (roomId) { | |||
| defaultRoom = roomId; | |||
| app.listen(3001); | |||
| app.listen(3002); | |||
There was a problem hiding this comment.
I think you forgot to remove this change from the commit, right?
| @@ -80,8 +80,9 @@ window.onload = function () { | |||
| req.setRequestHeader('Content-Type', 'application/json'); | |||
| req.send(JSON.stringify(roomData)); | |||
| }; | |||
|
|
|||
| var roomData = {username: 'user', role: 'presenter', room: roomName, type: roomType}; | |||
| var names = ['pedro', 'juan', 'manolo', 'tito', 'pepe', 'alonso', 'guancho']; | |||
extras/docker/initDockerLicode.sh
Outdated
| @@ -115,7 +119,11 @@ run_erizoController() { | |||
| run_erizoAgent() { | |||
| echo "Starting erizoAgent" | |||
| cd $ROOT/erizo_controller/erizoAgent | |||
| node erizoAgent.js & | |||
| if [ "$ERIZODEBUG" = "true" ]; then | |||
There was a problem hiding this comment.
We're using = throughout the whole file but == is more POSIX compliant so I'll switch all of them 👍
| }, { # OS!="mac" | ||
| 'cflags!' : ['-fno-exceptions'], | ||
| 'cflags' : ['-D__STDC_CONSTANT_MACROS'], | ||
| 'cflags_cc' : ['-Wall', '-O3', '-g' , '-std=c++11', '-fexceptions'], |
| @@ -59,7 +59,8 @@ int ExternalInput::init() { | |||
|
|
|||
| // VideoCodecInfo info; | |||
| MediaInfo om; | |||
| AVStream *st, *audio_st; | |||
| AVStream *st = nullptr; | |||
scripts/installErizo.sh
Outdated
| @@ -53,6 +55,9 @@ install_erizo(){ | |||
| cd $ROOT/erizo | |||
| ./generateProject.sh | |||
| ./buildProject.sh $FAST_MAKE | |||
| if [ $DELETE_OBJECT_FILES == 'true' ]; then | |||
There was a problem hiding this comment.
in other places we do if [ "$DELETE_OBJECT_FILES" == "true" ];, I didn't know it works like this too, great!
There was a problem hiding this comment.
Even if it works, I'll switch to " for consistency 🙂
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds "Release" and "Debug" configurations for both erizo and erizoAPI. The main difference is that Erizo is now built with
-O3. Both are built by default, while "Release" is the one that's normally used by ErizoJS.In order to run the debug version of both erizo and erizoAPI, you can start erizoAgent with
initErizoAgent.sh -dor, if you are running the docker image, you can add--erizoDebug.Also, we're now using
rpathwhen building erizoAPI, meaning that we no longer needLD_LIBRARY_PATHfor Licode.Warning for Spine users: You do need
LD_LIBRARY_PATHand note thatliberizois now undererizo/build/release/erizoorerizo/build/debug/erizo.Finally, in the Docker image we're keeping both builds but removing the object files in
CMakeFilesto save some space.[] It needs and includes Unit Tests
Changes in Client or Server public APIs
[] It includes documentation for these changes in
/doc.