From b11ee16354a62aa8f21f8a86761219c5b2cc399a Mon Sep 17 00:00:00 2001 From: Gabriel Wang Date: Fri, 24 Jun 2022 13:29:44 +0100 Subject: [PATCH] update cmsis-pack address (#160) --- PikaTech.PikaScript.pdsc | 198 ---------------- gen_pack.sh | 221 ------------------ port/cmsis-pack/PikaTech.PikaScript.pdsc | 2 +- .../pikascript/PikaTech.PikaScript.pdsc | 2 +- 4 files changed, 2 insertions(+), 421 deletions(-) delete mode 100644 PikaTech.PikaScript.pdsc delete mode 100644 gen_pack.sh diff --git a/PikaTech.PikaScript.pdsc b/PikaTech.PikaScript.pdsc deleted file mode 100644 index 4a3057fcb..000000000 --- a/PikaTech.PikaScript.pdsc +++ /dev/null @@ -1,198 +0,0 @@ - - - - PikaTech - perf_counter - PikaScript is an ultra-lightweight Python engine with zero dependencies and zero-configuration, that can run with 4KB of RAM and 32KB of flash. It's very easy to bind C function to python module with the help of Pika Pre-compiler.Only write the API of python in .pyi and the bindings are autoly generated by Pre-compiler. - https://raw.githubusercontent.com/pikaTech/pikaScript/master/cmsis-pack/ - https://github.com/pikasTech/pikascript/issues - LICENSE - - - - https://github.com/pikasTech/pikascript.git - - - - - First cmsis-pack - - - - - - - Python - MCU - - - - - Arm Compiler 5 (armcc) or Arm Compiler 6 (armclang). - - - - - - GNU Tools for Arm Embedded Processors. - - - - Support All Cortex-M based processors - - - - - - - - - - - - - - - - - - - - - Require CMSIS-CORE Support - - - - - Compile Cortex-M Processors with GNU Tools for Arm Embedded Processors. - - - - - Compile Cortex-M Processors with GNU Tools for Arm Embedded Processors. - - - - - - Compile Cortex-M Processors with GNU Tools for Arm Embedded Processors. - - - - - - Compile Cortex-M Processors with GNU Tools for Arm Embedded Processors. - - - - - - - The Kernel of the PikaScript - - - - - - - - - - - - - - - - - - - - - - an ultra-lightweight Python engine - https://pikadoc.readthedocs.io/en/latest/index.html - - - PikaScript Kernel - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#define RTE_Script_PikaScript - - - - - The standard library for PikaScript - - - - - - - - - - - - diff --git a/gen_pack.sh b/gen_pack.sh deleted file mode 100644 index b79d5ffda..000000000 --- a/gen_pack.sh +++ /dev/null @@ -1,221 +0,0 @@ -#!/bin/bash -# Version: 1.1 -# Date: 2020-04-29 -# This bash script generates a CMSIS Software Pack: -# -# Pre-requisites: -# - bash shell (for Windows: install git for Windows) -# - 7z in path (zip archiving utility) -# e.g. Ubuntu: sudo apt-get install p7zip-full p7zip-rar) -# - PackChk in path with execute permission -# (see CMSIS-Pack: CMSIS/Utilities//PackChk) -# - xmllint in path (XML schema validation) -# e.g. Ubuntu: sudo apt-get install libxml2-utils -# Windows: download from https://www.zlatkovic.com/pub/libxml/ - -############### EDIT BELOW ############### -# Extend Path environment variable locally -# -if [ `uname -s` = "Linux" ] - then - CMSIS_PACK_PATH="/home/$USER/.arm/Packs/ARM/CMSIS/5.9.0/" - PATH_TO_ADD="$CMSIS_PACK_PATH/CMSIS/Utilities/Linux64/" -else - CMSIS_PACK_PATH="/C/Users/gabriel/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0" - PATH_TO_ADD="/C/Program Files (x86)/7-Zip/:$CMSIS_PACK_PATH/CMSIS/Utilities/Win32/:/C/xmllint/" -fi -[[ ":$PATH:" != *":$PATH_TO_ADD}:"* ]] && PATH="${PATH}:${PATH_TO_ADD}" -echo $PATH_TO_ADD appended to PATH -echo " " - -# Pack warehouse directory - destination -PACK_WAREHOUSE=cmsis-pack/ - -# Temporary pack build directory -PACK_BUILD=build/ - -# Specify directories included in pack relative to base directory -# All directories: -# PACK_DIRS=`ls -d */` -# Do not include the build directory if it is local -# PACK_DIRS=${PACK_DIRS//$PACK_BUILD/} -# PACK_DIRS=${PACK_DIRS//$PACK_WAREHOUSE/} - -# alternative: specify directory names to be added to pack base directory -PACK_DIRS=" - lib - os - documents -" - - -# Specify file names to be added to pack base directory -PACK_BASE_FILES=" - perf_counter.c - perf_counter.h - systick_wrapper_gcc.s - systick_wrapper_ual.s - LICENSE - README.md -" - -############ DO NOT EDIT BELOW ########### -echo Starting CMSIS-Pack Generation: `date` -# Zip utility check -ZIP=7z -type -a $ZIP -errorlevel=$? -if [ $errorlevel -gt 0 ] - then - echo "Error: No 7zip Utility found" - echo "Action: Add 7zip to your path" - echo " " - exit -fi - -# Pack checking utility check -PACKCHK=PackChk -type -a $PACKCHK -errorlevel=$? -if [ $errorlevel != 0 ] - then - echo "Error: No PackChk Utility found" - echo "Action: Add PackChk to your path" - echo "Hint: Included in CMSIS Pack:" - echo "/ARM/CMSIS//CMSIS/Utilities//" - echo " " - exit -fi -echo " " - -# XML syntax checking utility check -XMLLINT=xmllint -type -a $XMLLINT -errorlevel=$? -if [ $errorlevel != 0 ] - then - echo "Error: No xmllint found" - echo "Action: Add xmllint to your path" - echo " " - exit -fi -echo " " - -# Locate Package Description file -# check whether there is more than one pdsc file -NUM_PDSCS=`ls -1 *.pdsc | wc -l` -PACK_DESCRIPTION_FILE=`ls *.pdsc` -if [ $NUM_PDSCS -lt 1 ] - then - echo "Error: No *.pdsc file found in current directory" - echo " " -elif [ $NUM_PDSCS -gt 1 ] - then - echo "Error: Only one PDSC file allowed in directory structure:" - echo "Found:" - echo "$PACK_DESCRIPTION_FILE" - echo "Action: Delete unused pdsc files" - echo " " - exit -fi - -SAVEIFS=$IFS -IFS=. -set $PACK_DESCRIPTION_FILE -# Pack Vendor -PACK_VENDOR=$1 -# Pack Name -PACK_NAME=$2 -echo Generating Pack Version: for $PACK_VENDOR.$PACK_NAME -echo " " -IFS=$SAVEIFS - -#if $PACK_BUILD directory does not exist, create it. -if [ ! -d $PACK_BUILD ]; then - mkdir -p $PACK_BUILD -fi - -# Copy files into build base directory: $PACK_BUILD -# pdsc file is mandatory in base directory: -cp -f ./$PACK_VENDOR.$PACK_NAME.pdsc ${PACK_BUILD} - -cp -f ./os/perf_os_patch_rtx5.c ./lib -cp -f ./os/perf_os_patch_freertos.c ./lib -cp -f ./os/perf_os_patch_rt_thread.c ./lib -cp -f ./os/perf_os_patch_threadx.c ./lib -cp -f ./perf_counter.h ./lib - -# directories -echo Adding directories to pack: -echo $PACK_DIRS -echo " " -for d in ${PACK_DIRS} -do - cp -r "$d" ${PACK_BUILD} -done - -# files for base directory -echo Adding files to pack: -echo $PACK_BASE_FILES -echo " " -for f in $PACK_BASE_FILES -do - cp -f "$f" $PACK_BUILD/ -done - - - -# Run Schema Check (for Linux only): -# sudo apt-get install libxml2-utils - -echo Running schema check for $PACK_VENDOR.$PACK_NAME.pdsc -$XMLLINT --noout --schema ${CMSIS_PACK_PATH}/CMSIS/Utilities/PACK.xsd $PACK_BUILD/$PACK_VENDOR.$PACK_NAME.pdsc -errorlevel=$? -if [ $errorlevel -ne 0 ]; then - echo "build aborted: Schema check of $PACK_VENDOR.$PACK_NAME.pdsc against PACK.xsd failed" - echo " " - exit -fi - -# Run Pack Check and generate PackName file with version -$PACKCHK $PACK_BUILD/$PACK_VENDOR.$PACK_NAME.pdsc -n PackName.txt -x M362 -errorlevel=$? -if [ $errorlevel -ne 0 ]; then - echo "build aborted: pack check failed" - echo " " - exit -fi - -PACKNAME=`cat PackName.txt` -rm -rf PackName.txt - -# Archiving -# $ZIP a $PACKNAME -echo creating pack file $PACKNAME -#if $PACK_WAREHOUSE directory does not exist create it -if [ ! -d $PACK_WAREHOUSE ]; then - mkdir -p $PACK_WAREHOUSE -fi -pushd $PACK_WAREHOUSE -PACK_WAREHOUSE=`pwd` -popd -pushd $PACK_BUILD -"$ZIP" a $PACK_WAREHOUSE/$PACKNAME -tzip -popd -errorlevel=$? -if [ $errorlevel -ne 0 ]; then - echo "build aborted: archiving failed" - exit -fi - -cp -f ./$PACK_VENDOR.$PACK_NAME.pdsc ${PACK_WAREHOUSE} - - -echo "build of pack succeeded" -# Clean up -echo "cleaning up ..." - -rm -rf $PACK_BUILD -echo " " - -echo Completed CMSIS-Pack Generation: `date` diff --git a/port/cmsis-pack/PikaTech.PikaScript.pdsc b/port/cmsis-pack/PikaTech.PikaScript.pdsc index 036da2ae1..aefe1c562 100644 --- a/port/cmsis-pack/PikaTech.PikaScript.pdsc +++ b/port/cmsis-pack/PikaTech.PikaScript.pdsc @@ -16,7 +16,7 @@ https://github.com/pikasTech/pikascript.git - + - PikaScript v1.8.7 diff --git a/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc b/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc index 036da2ae1..aefe1c562 100644 --- a/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc +++ b/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc @@ -16,7 +16,7 @@ https://github.com/pikasTech/pikascript.git - + - PikaScript v1.8.7