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 #11962 from compucorp/55-hide-adding-option-value-for-locked-groups
[civicrm-core.git]
/
distmaker
/
dists
/
common.sh
diff --git
a/distmaker/dists/common.sh
b/distmaker/dists/common.sh
index f3a8cca6e11da230d48f8292ada202e97d930e3b..e760bf593054d3dd6b2269a706e7fb2e216c950b 100644
(file)
--- a/
distmaker/dists/common.sh
+++ b/
distmaker/dists/common.sh
@@
-65,7
+65,7
@@
function dm_install_core() {
local repo="$1"
local to="$2"
local repo="$1"
local to="$2"
- for dir in ang css i js PEAR templates bin CRM api extern Reports install settings Civi partials release-notes ; do
+ for dir in ang css i js PEAR templates bin CRM api extern Reports install settings Civi partials release-notes
xml
; do
[ -d "$repo/$dir" ] && dm_install_dir "$repo/$dir" "$to/$dir"
done
[ -d "$repo/$dir" ] && dm_install_dir "$repo/$dir" "$to/$dir"
done
@@
-162,7
+162,8
@@
function dm_install_vendor() {
local to="$2"
local excludes_rsync=""
local to="$2"
local excludes_rsync=""
- for exclude in .git .svn {T,t}est{,s} {D,d}oc{,s} {E,e}xample{,s} ; do
+ ## CRM-21729 - .idea test-cases unit-test come from phpquery package.
+ for exclude in .git .svn {T,t}est{,s} {D,d}oc{,s} {E,e}xample{,s} .idea test-cases unit-test; do
excludes_rsync="--exclude=${exclude} ${excludes_rsync}"
done
excludes_rsync="--exclude=${exclude} ${excludes_rsync}"
done
@@
-219,6
+220,7
@@
function dm_generate_version() {
# final touch
echo "<?php
# final touch
echo "<?php
+/** @deprecated */
function civicrmVersion( ) {
return array( 'version' => '$DM_VERSION',
'cms' => '$ufname',
function civicrmVersion( ) {
return array( 'version' => '$DM_VERSION',
'cms' => '$ufname',