midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve and install CheckConflicts.sh in lib directory

This commit is contained in:
Carlos Ruiz 2009-09-16 02:21:01 +00:00
parent d7c297293b
commit 3c9aa3a8e2
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/build.xml
View File

@ -152,7 +152,8 @@
<mkdir dir="${build.dir}/Adempiere/packages/liberoHR"/> <mkdir dir="${build.dir}/Adempiere/packages/liberoHR"/>
<mkdir dir="${build.dir}/Adempiere/packages/liberoHR/lib"/> <mkdir dir="${build.dir}/Adempiere/packages/liberoHR/lib"/>
<copy file="../packages/liberoHR.jar" tofile="${build.dir}/Adempiere/packages/liberoHR/lib/liberoHR.jar"/> <copy file="../packages/liberoHR.jar" tofile="${build.dir}/Adempiere/packages/liberoHR/lib/liberoHR.jar"/>
<copy file="../lib/CheckConflicts.sh" tofile="${build.dir}/Adempiere/lib"/>
<!-- Base Directory --> <!-- Base Directory -->
<copy todir="${build.dir}/Adempiere"> <copy todir="${build.dir}/Adempiere">

26
lib/CheckConflicts.sh
View File

@ -6,6 +6,8 @@
PROCESS=$$ PROCESS=$$
TMPDIR=/tmp TMPDIR=/tmp
TMPLISADEMPIEREORIGINAL=$TMPDIR/lisadempiereoriginal$PROCESS.txt
TMPLISWEBUIORIGINAL=$TMPDIR/liswebuioriginal$PROCESS.txt
TMPLISPATCHES=$TMPDIR/lispatches$PROCESS.txt TMPLISPATCHES=$TMPDIR/lispatches$PROCESS.txt
TMPLISCUST=$TMPDIR/liscustomization$PROCESS.txt TMPLISCUST=$TMPDIR/liscustomization$PROCESS.txt
TMPLISPACK=$TMPDIR/lispackages$PROCESS.txt TMPLISPACK=$TMPDIR/lispackages$PROCESS.txt
@ -17,6 +19,16 @@ TMPLISZKPACK=$TMPDIR/liszkpackages$PROCESS.txt
TMPLISZKALLPACK=$TMPDIR/liszkallpackages$PROCESS.txt TMPLISZKALLPACK=$TMPDIR/liszkallpackages$PROCESS.txt
TMPLISZKUNQPACK=$TMPDIR/liszkunqpackages$PROCESS.txt TMPLISZKUNQPACK=$TMPDIR/liszkunqpackages$PROCESS.txt
jar tf AdempiereOriginal.jar |
fgrep -v META-INF |
fgrep .class |
sort > $TMPLISADEMPIEREORIGINAL
jar tf webuiOriginal.war |
fgrep -v META-INF |
fgrep .class |
sort > $TMPLISWEBUIORIGINAL
jar tf patches.jar | jar tf patches.jar |
fgrep -v META-INF | fgrep -v META-INF |
fgrep .class | fgrep .class |
@ -72,6 +84,18 @@ sort -o $TMPLISZKALLPACK $TMPLISZKALLPACK
sort -u -o $TMPLISZKUNQPACK $TMPLISZKALLPACK sort -u -o $TMPLISZKUNQPACK $TMPLISZKALLPACK
if [ `comm -12 $TMPLISPACK $TMPLISADEMPIEREORIGINAL | wc -l` -ne 0 ]
then
echo "** WARNING: Package classes are overwritting Adempiere classes. Package will take precedence"
comm -12 $TMPLISPACK $TMPLISADEMPIEREORIGINAL
fi
if [ `comm -12 $TMPLISZKPACK $TMPLISWEBUIORIGINAL | wc -l` -ne 0 ]
then
echo "** WARNING: ZK Package classes are overwritting ZK webui original classes. ZK Package will take precedence"
comm -12 $TMPLISZKPACK $TMPLISWEBUIORIGINAL
fi
if [ `comm -12 $TMPLISPATCHES $TMPLISCUST | wc -l` -ne 0 ] if [ `comm -12 $TMPLISPATCHES $TMPLISCUST | wc -l` -ne 0 ]
then then
echo "** WARNING: Dup files in customization and patches. Customization will take precedence" echo "** WARNING: Dup files in customization and patches. Customization will take precedence"
@ -120,4 +144,4 @@ then
comm -23 $TMPLISZKALLPACK $TMPLISZKUNQPACK comm -23 $TMPLISZKALLPACK $TMPLISZKUNQPACK
fi fi
rm -f $TMPLISPATCHES $TMPLISCUST $TMPLISPACK $TMPLISALLPACK $TMPLISUNQPACK $TMPLISZKPATCHES $TMPLISZKCUST $TMPLISZKPACK $TMPLISZKALLPACK $TMPLISZKUNQPACK rm -f $TMPLISADEMPIEREORIGINAL $TMPLISWEBUIORIGINAL $TMPLISPATCHES $TMPLISCUST $TMPLISPACK $TMPLISALLPACK $TMPLISUNQPACK $TMPLISZKPATCHES $TMPLISZKCUST $TMPLISZKPACK $TMPLISZKALLPACK $TMPLISZKUNQPACK