Quellcode durchsuchen

Corrections in schema. Redirect 7zip stdout to file

Joachim Krech vor 9 Jahren
Ursprung
Commit
c6316a6e2c
2 geänderte Dateien mit 9 neuen und 6 gelöschten Zeilen
  1. 2 2
      CMSIS/Utilities/PACK.xsd
  2. 7 4
      CMSIS/Utilities/gen_pack.bat

+ 2 - 2
CMSIS/Utilities/PACK.xsd

@@ -1222,7 +1222,7 @@
     <!-- name of the package -->
     <xs:attribute name="name"    type="xs:string"            use="required"/>
     <!-- version or version range of the package -->
-    <xs:attribute name="version" type="ConditionVersionType" use="required"/>
+    <xs:attribute name="version" type="ConditionVersionType" use="optional"/>
   </xs:complexType>
   
   <!-- Package dependency section type (added in 1.4.4) -->
@@ -1250,7 +1250,7 @@
   <!-- CompilerType crates a unique toolchain ID, e.g. armcc 5.4.0 (added in 1.4.4) -->
   <xs:complexType name="CompilerType">
     <xs:attribute name="name"    type="CompilerEnumType" use="required"/>
-    <xs:attribute name="version" type="ConditionVersionType" use="required"/>
+    <xs:attribute name="version" type="xs:string" use="required"/>
   </xs:complexType>
 
   <!-- Compiler section type (added in 1.4.4) -->

+ 7 - 4
CMSIS/Utilities/gen_pack.bat

@@ -169,7 +169,7 @@ POPD
 
 
 :: Checking 
-PackChk.exe %RELEASE_PATH%\ARM.CMSIS.pdsc -n %RELEASE_PATH%\PackName.txt -x M353
+PackChk.exe %RELEASE_PATH%\ARM.CMSIS.pdsc -n %RELEASE_PATH%\PackName.txt -x M353 -x M364
 
 :: --Check if PackChk.exe has completed successfully
 IF %errorlevel% neq 0 GOTO ErrPackChk
@@ -182,7 +182,9 @@ SET /P PackName=<PackName.txt
 DEL /Q PackName.txt
 
 :: Pack files
-7z.exe a %PackName% -tzip
+ECHO Creating pack file ...
+7z.exe a %PackName% -tzip > zip.log
+ECHO Packaging complete
 POPD
 GOTO End
 
@@ -191,9 +193,10 @@ ECHO PackChk.exe has encountered an error!
 EXIT /b
 
 :End
-ECHO removing temporary folders
+ECHO Removing temporary files and folders
 RMDIR /Q /S  %RELEASE_PATH%\CMSIS
 RMDIR /Q /S  %RELEASE_PATH%\Device
 DEL %RELEASE_PATH%\LICENSE.txt
+DEL %RELEASE_PATH%\zip.log
 
-ECHO PACK generation completed.
+ECHO gen_pack.bat completed successfully