Skip to content

Commit

Permalink
build: remove router-specific versioning process (angular#16810)
Browse files Browse the repository at this point in the history
  • Loading branch information
Suguru Inatomi authored and juleskremer committed Aug 24, 2017
1 parent 3932700 commit d554f7b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
13 changes: 2 additions & 11 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ BUILD_ALL=true
BUNDLE=true
VERSION_PREFIX=$(node -p "require('./package.json').version")
VERSION_SUFFIX="-$(git log --oneline -1 | awk '{print $1}')"
ROUTER_VERSION_PREFIX=$(node -p "require('./package.json').version.replace(/^2/, '3')")
REMOVE_BENCHPRESS=false
BUILD_EXAMPLES=true
COMPILE_SOURCE=true
Expand Down Expand Up @@ -329,8 +328,7 @@ mapSources() {
}

VERSION="${VERSION_PREFIX}${VERSION_SUFFIX}"
ROUTER_VERSION="${ROUTER_VERSION_PREFIX}${VERSION_SUFFIX}"
echo "====== BUILDING: Version ${VERSION} (Router ${ROUTER_VERSION})"
echo "====== BUILDING: Version ${VERSION}"

N="
"
Expand Down Expand Up @@ -428,12 +426,7 @@ do
MODULES_DIR=${NPM_DIR}/@angular
BUNDLES_DIR=${NPM_DIR}/bundles

if [[ ${PACKAGE} != router ]]; then
LICENSE_BANNER=${ROOT_DIR}/license-banner.txt
fi
if [[ ${PACKAGE} == router ]]; then
LICENSE_BANNER=${ROOT_DIR}/router-license-banner.txt
fi
LICENSE_BANNER=${ROOT_DIR}/license-banner.txt

if [[ ${COMPILE_SOURCE} == true ]]; then
rm -rf ${OUT_DIR}
Expand Down Expand Up @@ -488,8 +481,6 @@ do
cd ${NPM_DIR}
echo "====== EXECUTE: perl -p -i -e \"s/0\.0\.0\-PLACEHOLDER/${VERSION}/g\" $""(grep -ril 0\.0\.0\-PLACEHOLDER .)"
perl -p -i -e "s/0\.0\.0\-PLACEHOLDER/${VERSION}/g" $(grep -ril 0\.0\.0\-PLACEHOLDER .) < /dev/null 2> /dev/null
echo "====== EXECUTE: perl -p -i -e \"s/0\.0\.0\-ROUTERPLACEHOLDER/${ROUTER_VERSION}/g\" $""(grep -ril 0\.0\.0\-ROUTERPLACEHOLDER .)"
perl -p -i -e "s/0\.0\.0\-ROUTERPLACEHOLDER/${ROUTER_VERSION}/g" $(grep -ril 0\.0\.0\-ROUTERPLACEHOLDER .) < /dev/null 2> /dev/null
)
fi

Expand Down
5 changes: 0 additions & 5 deletions packages/router-license-banner.txt

This file was deleted.

0 comments on commit d554f7b

Please sign in to comment.