shenshihai преди 2 години
родител
ревизия
3f4159cb30
променени са 6 файла, в които са добавени 3 реда и са изтрити 4 реда
  1. 2 4
      composer.json
  2. BIN
      upgrade/globalSetting.pyc
  3. BIN
      upgrade/updateConfigdb.pyc
  4. 1 0
      upgrade/upgrade.txt
  5. BIN
      upgrade/upgrade31-u.exe
  6. BIN
      upgrade/upgrade_configdb.pyc

+ 2 - 4
composer.json

@@ -4,7 +4,7 @@
 	"description": "tri5990v31-win64 app",
 	"license": "MIT",
 	"minimum-stability": "dev",
-	"version": "3.1.0.0",
+	"version": "3.1.1.1",
 	"require": {
 		"a/distribute-helper": "dev-master",
 		"sis31/taskentry": "0.2",	
@@ -35,7 +35,6 @@
 		"sis31/widget-win64": "0.1",
 		"sis31/manual": "0.1",
 		"sis31/samplemgr-win64": "0.1",
-		"sis31/upgrade-win64": "0.2",
 		"sis31/pretrain":"0.1",
 		"sis31/create-simg-job":"0.1",
 		"sis31/py388-win64":"3.8.8",
@@ -80,7 +79,6 @@
 			"sis31/manual": "www/manual",
 			"sis31/desktop-win64": "desktop",
 			"sis31/samplemgr-win64": "samplemgr",
-			"sis31/upgrade-win64": "upgrade",
 			"tools/qcefview-win64": "tools/qcefview",
 			"tools/sumatrapdf-win64": "tools/pdfviewer",
 			"tools/zdevelop-win64": "tools/zdevelop",
@@ -110,7 +108,7 @@
 		],
 		"script-files":[
 			{"name":"vendor/sis31/py388-win64/install_whl.txt","type":"*","desc":""},
-			{"name":"vendor/sis31/upgrade-win64/upgrade.txt","type":"upgrade","desc":"upgrade db files"}
+			{"name":"upgrade/upgrade.txt","type":"upgrade","desc":"upgrade db files"}
 		],
 		"remove-service":[
 			{"name": "SisMysql8"}

BIN
upgrade/globalSetting.pyc


BIN
upgrade/updateConfigdb.pyc


+ 1 - 0
upgrade/upgrade.txt

@@ -0,0 +1 @@
+{root}/module/python/python.exe {root}/upgrade/upgrade_configdb.pyc --upgrade-from {upgradeFrom}/config/config.db --tpl-path {root}/module/localcfg/config.db --root-path {root}/config/config.db

BIN
upgrade/upgrade31-u.exe


BIN
upgrade/upgrade_configdb.pyc