arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make uploading to FRS area the default in the trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11306 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
bp-sawyers 2011-12-27 10:44:55 +00:00
parent da3e4492ec
commit 309400c332
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildcore.sh
View File

@ -25,7 +25,7 @@
# xcat-core tarball to the SF web site instead of the FRS area.
# UP=0 or UP=1 - override the default upload behavior
# SVNUP=<filename> - control which rpms get built by specifying a coresvnup file
# FRSYUM=1 - put the yum repo and snap builds in the FRS area instead of project web area.
# FRSYUM=0 - put the yum repo and snap builds in the old project web area instead of the FRS area.
# VERBOSE=1 - to see lots of verbose output
# you can change this if you need to
@ -67,7 +67,7 @@ if [ "$OSNAME" != "AIX" ]; then
fi
# this is needed only when we are transitioning the yum over to frs
if [ "$FRSYUM" = 1 ]; then
if [ "$FRSYUM" != 0 ]; then
YUMDIR=$FRS
YUMREPOURL="https://sourceforge.net/projects/xcat/files/yum"
else

8
builddep.sh
View File

@ -15,7 +15,7 @@
# DESTDIR=<dir> - the dir to place the dep tarball in. The default is ../../../xcat-dep, relative
# to where this script is located.
# UP=0 or UP=1 - override the default upload behavior
# FRSYUM=1 - put the directory of individual rpms in the FRS area instead of project web area.
# FRSYUM=0 - put the directory of individual rpms in the project web area instead of the FRS area.
# VERBOSE=1 - to see lots of verbose output
# you can change this if you need to
@ -45,7 +45,7 @@ fi
# this is needed only when we are transitioning the yum over to frs
YUMREPOURL1="http://xcat.sourceforge.net/yum"
YUMREPOURL2="https://sourceforge.net/projects/xcat/files/yum"
if [ "$FRSYUM" = 1 ]; then
if [ "$FRSYUM" != 0 ]; then
YUMDIR=$FRS
YUMREPOURL="$YUMREPOURL2"
else
@ -115,7 +115,7 @@ if [ "$OSNAME" != "AIX" ]; then
done
# Modify xCAT-dep.repo files to point to the correct place
if [ "$FRSYUM" = 1 ]; then
if [ "$FRSYUM" != 0 ]; then
newurl="$YUMREPOURL2"
oldurl="$YUMREPOURL1"
else
@ -230,7 +230,7 @@ fi
# Upload the dir structure to SF yum area. Currently we do not have it preserving permissions
# because that gives errors when different users try to do it.
i=0
if [ "$FRSYUM" = 1 ]; then
if [ "$FRSYUM" != 0 ]; then
links="-L" # FRS does not support rsyncing sym links
else
links="-l"

2
xCAT-UI/xCAT-UI.spec
View File

@ -46,6 +46,7 @@ FILES=`find ${UI_JS} -name '*.js'`
for i in ${FILES[*]}; do
# Ignore Javascripts that are already minified
if [[ ! $i =~ '.*\.min\.js$' ]]; then
echo " Minifying $i ..."
`${JAVA} -jar ${COMPILER_JAR} --warning_level=QUIET --js=$i --js_output_file=$i.min`
# Remove old Javascript and replace it with minified version
@ -61,6 +62,7 @@ FILES=`find ${UI_JS} -name '*.js'`
for i in ${FILES[*]}; do
# Ignore Javascripts that are already minified
if [[ ! $i = @(*.min.js) ]]; then
echo " Minifying $i ..."
`${JAVA} -jar ${COMPILER_JAR} --warning_level=QUIET --js=$i --js_output_file=$i.min`
# Remove old Javascript and replace it with minified version