Skip to content

Commit

Permalink
Merge 259bdc4 into c9ae859
Browse files Browse the repository at this point in the history
  • Loading branch information
pratid committed Jan 29, 2015
2 parents c9ae859 + 259bdc4 commit 90c1649
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ngsi_adapter/script/build/jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ PRODUCT_RELEASE=$(echo "$PRODUCT_INFO" | sed -n '/"release"/ {s/.*:.*"\(.*\)".*/
PROJECT_NAME=$(sed -n '/"name"/ {s/.*:.*"\(.*\)".*/\1/; p; q}' $PROJECT_BASE_DIR/package.json)
PROJECT_VERSION=$(sed -n '/"version"/ {s/.*:.*"\(.*\)".*/\1/; p; q}' $PROJECT_BASE_DIR/package.json)
SONAR_PROJECT_NAME=$(echo "$PRODUCT_NAME-$PROJECT_NAME" | tr '_' '-')
SONAR_PROJECT_KEY=com.telefonica.fiware:$SONAR_PROJECT_NAME
SONAR_PROJECT_KEY=com.telefonica.IoT:$SONAR_PROJECT_NAME

# Change to project directory
cd $PROJECT_BASE_DIR
Expand Down
2 changes: 1 addition & 1 deletion ngsi_event_broker/script/build/jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ PRODUCT_RELEASE=$(sed -n '/\[PRODUCT_RELEASE\]/ {s/.*\[.*\].*\[\(.*\)\].*/\1/; p
PROJECT_NAME=$(sed -n '/AC_INIT/ {s/.*\[PRODUCT_NAME-\(.*\)].*/\1/; p}' $PROJECT_DIR/configure.ac)
PROJECT_VERSION=$(sed -n '/AC_INIT/ {s/.*,[ \t]*\(.*\))/\1/; p}' $PROJECT_DIR/configure.ac)
SONAR_PROJECT_NAME=$(echo "$PRODUCT_NAME-$PROJECT_NAME" | tr '_' '-')
SONAR_PROJECT_KEY=com.telefonica.fiware:$SONAR_PROJECT_NAME
SONAR_PROJECT_KEY=com.telefonica.IoT:$SONAR_PROJECT_NAME

# Dependencies
RPM_DEPENDENCIES="wget gcc-c++ make autoconf automake libtool cppunit-devel libcurl-devel"
Expand Down

0 comments on commit 90c1649

Please sign in to comment.