projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1 from civicrm/master
[civicrm-core.git]
/
distmaker
/
distmaker.sh
diff --git
a/distmaker/distmaker.sh
b/distmaker/distmaker.sh
index be5a3c245dcdd5c8841cf46d9d3151d2edf2e75c..5471d6ae0dc8fe16524455c3a5a355ee11279746 100755
(executable)
--- a/
distmaker/distmaker.sh
+++ b/
distmaker/distmaker.sh
@@
-43,6
+43,7
@@
J5PACK=0
WP5PACK=0
SK5PACK=0
L10NPACK=0
WP5PACK=0
SK5PACK=0
L10NPACK=0
+REPOREPORT=0
# Display usage
display_usage()
# Display usage
display_usage()
@@
-192,6
+193,12
@@
case $1 in
WP5PACK=1
;;
WP5PACK=1
;;
+ # REPO REPORT PHP5
+ report)
+ echo; echo "Generating repo report module"; echo;
+ REPOREPORT=1
+ ;;
+
# ALL
all)
echo; echo "Generating all the tarballs we've got (not the directories). "; echo;
# ALL
all)
echo; echo "Generating all the tarballs we've got (not the directories). "; echo;
@@
-202,6
+209,7
@@
case $1 in
WP5PACK=1
SKPACK=1
L10NPACK=1
WP5PACK=1
SKPACK=1
L10NPACK=1
+ REPOREPORT=1
;;
# USAGE
;;
# USAGE
@@
-229,6
+237,10
@@
fi
## Get latest dependencies
dm_generate_vendor "$DM_SOURCEDIR"
## Get latest dependencies
dm_generate_vendor "$DM_SOURCEDIR"
+## if we already have a bower_compoents dir empty it.
+if [ -d "$DM_SOURCEDIR/bower_components" ]; then
+ rm -rf $DM_SOURCEDIR/bower_components/*
+fi
dm_generate_bower "$DM_SOURCEDIR"
# Before anything - regenerate DAOs
dm_generate_bower "$DM_SOURCEDIR"
# Before anything - regenerate DAOs
@@
-285,5
+297,19
@@
if [ "$WP5PACK" = 1 ]; then
bash $P/dists/wordpress_php5.sh
fi
bash $P/dists/wordpress_php5.sh
fi
+if [ "$REPOREPORT" = 1 ]; then
+ echo; echo "Preparing repository report"; echo;
+ env \
+ L10NPACK="$L10NPACK" \
+ BPACK="$BPACK" \
+ D56PACK="$D56PACK" \
+ D5PACK="$D5PACK" \
+ D7DIR="$D7DIR" \
+ SKPACK="$SKPACK" \
+ J5PACK="$J5PACK" \
+ WP5PACK="$WP5PACK" \
+ bash $P/dists/repo-report.sh
+fi
+
unset DM_SOURCEDIR DM_GENFILESDIR DM_TARGETDIR DM_TMPDIR DM_PHP DM_RSYNC DM_VERSION DM_ZIP
echo;echo "DISTMAKER Done.";echo;
unset DM_SOURCEDIR DM_GENFILESDIR DM_TARGETDIR DM_TMPDIR DM_PHP DM_RSYNC DM_VERSION DM_ZIP
echo;echo "DISTMAKER Done.";echo;