build.sh

ixre · Dec 18, 2018 · 1cbc09c · 1cbc09c
1 parent 96351aa
commit 1cbc09c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 39 deletions.
diff --git a/cms/core/JR.Cms.Core/_#upgrade/upgrade.xml → cms/core/JR.Cms.Core/_#upgrade/upgrade2.xml b/cms/core/JR.Cms.Core/_#upgrade/upgrade.xml → cms/core/JR.Cms.Core/_#upgrade/upgrade2.xml
diff --git a/cms/core/JR.Cms.Core/_#upgrade/v2/upgrade.xml b/cms/core/JR.Cms.Core/_#upgrade/v2/upgrade.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<upgrade version="1.9.0" patch="j6.cms.libs.zip">
+<upgrade version="3.2.001" patch="cms.patch.zip">
 <![CDATA[
 
-版本:v2.0 (beta) build20130904
-1.更新后台操作UI
-2.后台AJAX操作<br />
-<span style="color:red">本版本为测试版，请谨慎选择升级！</span>
+JRCMS 版本:v3.2.001  build20181220
+=============================================
+1.系统栏目重构，支持同名的栏目
+2.修改已知的问题
+
+<span style="color:red">
+本版本请在技术人员指导下进行操作升级，请用户勿擅自升级！ 
+</span>
 
 ]]>
 </upgrade>
diff --git a/script/build-dist.sh b/script/build-dist.sh
diff --git a/script/build.sh b/script/build.sh
@@ -33,8 +33,11 @@ ${cur}/merge.exe -closed -ndebug \
 echo "2. prepare files"
 tmp_dir=$(pwd)/dist/tmp
 dll_dir=$(pwd)/refrence.dll
+exe_dir=$(pwd)/script
+
 rm -rf $tmp_dir && mkdir -p $tmp_dir/templates \
-	&& mkdir -p $tmp_dir/bin
+	&& mkdir -p $tmp_dir/bin \
+	&& mkdir -p $tmp_dir/../patch
 
 cd $(find . -path "*/JR.Cms.WebUI") && \
 	cp -r \$server install plugins public \
@@ -48,7 +51,14 @@ cp LICENSE README.md $tmp_dir && cp dist/boot.dll \
 
 cp dist/jrcms.dll $dll_dir/jrdev* $tmp_dir/public/assemblies 
 
-echo "2. package upgrade zip"
+echo "3. package upgrade zip"
+cd $tmp_dir && cp -r $(find $exe_dir/../cms -name "upgrade.xml") ../patch \
+	&& $exe_dir/7z.exe a -tzip ../patch/boot.zip bin >/dev/null \
+	&& $exe_dir/7z.exe a -tzip ../patch/cms-patch.zip >/dev/null
+
+echo "4. package all" 
+$exe_dir/7z.exe a -tzip ../jrcms-dist-1.0.zip * >/dev/null
 
+echo "5. clean" && rm -rf $tmp_dir
 
 sleep 2 && echo "build success!"