Skip to content

Commit

Permalink
remove registry
Browse files Browse the repository at this point in the history
  • Loading branch information
DevChu committed Oct 6, 2023
1 parent 1c68bb4 commit 1731cdb
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 476 deletions.
99 changes: 0 additions & 99 deletions bin/genmd5sign

This file was deleted.

102 changes: 0 additions & 102 deletions bin/md5java

This file was deleted.

32 changes: 16 additions & 16 deletions bin/upVer
Original file line number Diff line number Diff line change
Expand Up @@ -45,71 +45,71 @@ fi

function upVer {
if [ "$isFL" == "FL" ] ; then
sed -i "/version>/,/<\//s/>$oldVersion.*<\//>$newVersion-SNAPSHOT<\//" $1/pom.xml
sed -i "" "/version>/,/<\//s/>$oldVersion.*<\//>$newVersion-SNAPSHOT<\//" $1/pom.xml
echo "$1 pom.xml"
grep -n --color=auto $newVersion"-SNAPSHOT" $1/pom.xml
else
sed -i "/version>/,/<\//s/>$oldVersion.*<\//>$newVersion<\//" $1/pom.xml
sed -i "" "/version>/,/<\//s/>$oldVersion.*<\//>$newVersion<\//" $1/pom.xml
echo "$1 pom.xml"
grep -n --color=auto $newVersion $1/pom.xml
fi

if [[ -f "$1/version" ]]; then
sed -i "s/$oldVersion.*/$newVersion/g" $1/version
sed -i "" "s/$oldVersion.*/$newVersion/g" $1/version
echo "$1 version"
grep -n --color=auto $newVersion $1/version
fi

if [[ -d "$1/src" ]]; then
echo "$1 MANIFEST.MF"
find $1/src -name MANIFEST.MF -exec sed -i "s/$oldVersion.*/$newVersion/g
find $1/src -name MANIFEST.MF -exec sed -i "" "s/$oldVersion.*/$newVersion/g
" {} \; -exec grep -n --color=auto $newVersion {} \;

echo "$1 config.xml"
find $1/src -name config.xml -exec sed -i "
find $1/src -name config.xml -exec sed -i "" "
/<version/,/\/version>/s/>$oldVersion.*<\//>$newVersion<\//g
" {} \; -exec grep -n --color=auto $newVersion {} \;

echo "$1 lang.xml"
find $1/src -name lang.xml -exec sed -i "
find $1/src -name lang.xml -exec sed -i "" "
/<version/,/\/version>/s/>$oldVersion.*<\//>$newVersion<\//g
" {} \; -exec grep -n --color=auto $newVersion {} \;

echo "$1 lang-addon.xml"
find $1/src -name lang-addon.xml -exec sed -i "
find $1/src -name lang-addon.xml -exec sed -i "" "
/<version/,/\/version>/s/>$oldVersion.*<\//>$newVersion<\//g
" {} \; -exec grep -n --color=auto $newVersion {} \;

echo "$1 Version.java"
find $1/src -name Version.java -exec sed -i "
find $1/src -name Version.java -exec sed -i "" "
s/UID = \"$oldVersion.*\";/UID = \"$newVersion\";/g
" {} \; -exec grep -n --color=auto $newVersion {} \;
fi
}

if [ "$3" == "FL" ] ; then
sed -i "s/$oldVersion.*/$newVersion-FL/g" $maindir/build.setting
sed -i "" "s/$oldVersion.*/$newVersion-FL/g" $maindir/build.setting
echo "build.setting"
grep -n --color=auto $newVersion"-FL" $maindir/build.setting

echo "zk Version.java"
find $maindir/zk/src -name Version.java -exec sed -i "
find $maindir/zk/src -name Version.java -exec sed -i "" "
s/RELEASE = \"$oldVersion.*\";/RELEASE = \"$newVersion-FL\";/g
" {} \; -exec grep -n --color=auto $newVersion"-FL" {} \;
else
sed -i "s/$oldVersion.*/$newVersion/g" $maindir/build.setting
sed -i "" "s/$oldVersion.*/$newVersion/g" $maindir/build.setting
echo "build.setting"
grep -n --color=auto $newVersion $maindir/build.setting

echo "zk Version.java"
find $maindir/zk/src -name Version.java -exec sed -i "
find $maindir/zk/src -name Version.java -exec sed -i "" "
s/RELEASE = \"$oldVersion.*\";/RELEASE = \"$newVersion\";/g
" {} \; -exec grep -n --color=auto $newVersion {} \;
fi
sed -i "s/$oldVersion.*/$newVersion/g" $maindir/deploy/version
sed -i "s/$oldVersion.*/$newVersion/g" $maindir/jsdoc/version
sed -i "s/$oldVersion.*/$newVersion/g" $maindir/zksandboxs/version
sed -i "s/$oldVersion.*/$newVersion/g" $maindir/zksandboxs/src/archive/META-INF/MANIFEST.MF
sed -i "" "s/$oldVersion.*/$newVersion/g" $maindir/deploy/version
sed -i "" "s/$oldVersion.*/$newVersion/g" $maindir/jsdoc/version
sed -i "" "s/$oldVersion.*/$newVersion/g" $maindir/zksandboxs/version
sed -i "" "s/$oldVersion.*/$newVersion/g" $maindir/zksandboxs/src/archive/META-INF/MANIFEST.MF
cd $maindir
upVer zk-parent
upVer zel
Expand Down
17 changes: 1 addition & 16 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ if [ "$1" = "" ] || [ "$1" = "lessc" ] || [ "$1" = "checkstyle" ] ; then
fi

#-- parsing cmd
cmdList=" bd br cd cr ud ur doc jsrc build.debug build.release clean clean.debug clean.release utest.debug utest.release javadoc jsdoc zipjs lessc tsmin dev help checkstyle "
cmdList=" bd br cd cr ud ur doc jsrc build.debug build.release clean clean.debug clean.release utest.debug utest.release javadoc jsdoc zipjs lessc tsmin help checkstyle "
if [ \( $# != 0 \) -a \( "${cmdList#* $1 }" != "$cmdList" \) ] ; then
cmd=$1
shift
Expand Down Expand Up @@ -493,20 +493,6 @@ function invoke_ant
else
gentime=$(grep '^time=' format)
gentime=${gentime#time=}
signdir=$(grep '^signdir=' format)
signdir=${signdir#signdir=}
signclasses=$(grep '^signclasses=' format)
signclasses=${signclasses#signclasses=}
if [ "$gentime" = "" ] && [ "$signdir" != "" ] && [ "$cmd" = "build" ] ; then
buildstamp=$(grep '^buildstamp=' format)
buildstamp=${buildstamp#buildstamp=}
if [ ! -f $maindir/zk/codegen/$buildstamp ] ; then
echo "zk's build stamp is not found, please build zk first"
exit -1
fi
else
buildstamp=$gentime
fi
CLASSPATH="$DCP" ANT_OPTS=-Xmx160M ant $verbose $class_test \
$doall -Dformat="$format" -Ddeploy="$deploy" \
-Dcheckstyle.java="$checkstyleJava" -Dcheckstyle.js="$checkstyleJs" \
Expand All @@ -527,7 +513,6 @@ function invoke_ant
-Dshare.javadoc.dir="$javadocdir" \
-Djavadoc.class.path="$DCP" -Dapp.name=$app $unziplist \
-Droot.context=$rootContext -Dgentime=$gentime \
-Dsigndir=$signdir -Dsignclasses=$signclasses -Dbuildstamp=$buildstamp \
$dfnList -buildfile $maindir/build.xml $1
fi

Expand Down
24 changes: 1 addition & 23 deletions build.target.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,6 @@ if="deploy.tomcat.required">
<target name="deploy" depends="deploy.lib, deploy.osgi, deploy.tomcat">
</target>

<target name="dev" depends="config, gentime">
<delete file="${zkcmldir}/zkex/${codegen.archive.dir}/metainfo/zk/buildsign" verbose="true" failonerror="false" />
<exec executable="bash" dir="." failonerror="true">
<arg value="${bin.dir}/genmd5sign"/>
<arg value="${codegen.dir}/${signdir}"/>
<arg value="${signclasses}"/>
<arg value="${out.dir}/classes"/>
<arg value="${maindir}/zk/${codegen.dir}/${buildstamp}"/>
<arg value="${maindir}"/>
</exec>
</target>

<!-- ===== -->
<!-- BUILD -->
<!-- ===== -->
Expand Down Expand Up @@ -201,7 +189,7 @@ if="deploy.tomcat.required">
<arg value="--dest=${codegen.archive.dir}/${zipjs}"/>
</exec>
</target>
<target name="build.jar" depends="lessc, zipjs, gentime, genmd5sign, compile" if="build.jar.required">
<target name="build.jar" depends="lessc, zipjs, gentime, compile" if="build.jar.required">
<available file="${srcpv.dir}" property="jar.srcpv.dir" value="${srcpv.dir}"/>
<property name="jar.srcpv.dir" value="${codegen.archive.dir}"/><!-- could be any existent directory -->

Expand Down Expand Up @@ -261,16 +249,6 @@ if="deploy.tomcat.required">
<arg value="${codegen.dir}/${gentime}"/>
</exec>
</target>
<target name="genmd5sign" depends="config" if="genmd5sign.required">
<exec executable="bash" dir="." failonerror="true">
<arg value="${bin.dir}/genmd5sign"/>
<arg value="${codegen.dir}/${signdir}"/>
<arg value="${signclasses}"/>
<arg value="${out.dir}"/>
<arg value="${maindir}/zk/${codegen.dir}/${buildstamp}"/>
<arg value="${maindir}"/>
</exec>
</target>

<target name="build.war" depends="compile" if="build.war.required">
<mkdir dir="${out.dir}"/>
Expand Down
6 changes: 0 additions & 6 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,6 @@ Copyright (C) 2002 Potix Corporation. All Rights Reserved.
</not>
</condition>

<condition property="genmd5sign.required">
<not>
<equals arg1="${signdir}" arg2=""/>
</not>
</condition>

<!-- deploy -->
<condition property="deploy.lib.required">
<equals arg1="${deploy}" arg2="lib"/>
Expand Down
Loading

0 comments on commit 1731cdb

Please sign in to comment.