From 63db1782d138131e145fdae97edffdf0bf49b0d6 Mon Sep 17 00:00:00 2001 From: Stefan Feuerhahn Date: Thu, 25 Jun 2020 15:25:13 +0200 Subject: [PATCH] combined asn1 compile scripts --- asn1/compile.sh | 12 ++++++++++++ asn1/{iso-acse-layer => }/iso-acse-layer.asn | 0 asn1/iso-acse-layer/compile.sh | 7 ------- .../iso-presentation-layer.asn | 0 asn1/iso-presentation-layer/compile.sh | 6 ------ asn1/{mms => }/mms.asn | 0 asn1/mms/compile.sh | 7 ------- asn1/mms/rename-berboolean.sh | 5 ----- asn1/readme.txt | 10 ++++++++++ asn1/replace-berboolean.sh | 6 ++++++ 10 files changed, 28 insertions(+), 25 deletions(-) create mode 100755 asn1/compile.sh rename asn1/{iso-acse-layer => }/iso-acse-layer.asn (100%) delete mode 100755 asn1/iso-acse-layer/compile.sh rename asn1/{iso-presentation-layer => }/iso-presentation-layer.asn (100%) delete mode 100755 asn1/iso-presentation-layer/compile.sh rename asn1/{mms => }/mms.asn (100%) delete mode 100755 asn1/mms/compile.sh delete mode 100755 asn1/mms/rename-berboolean.sh create mode 100644 asn1/readme.txt create mode 100755 asn1/replace-berboolean.sh diff --git a/asn1/compile.sh b/asn1/compile.sh new file mode 100755 index 0000000..adbefbe --- /dev/null +++ b/asn1/compile.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +cd `dirname $0` + +rm ../src/main/java-gen/com/beanit/josistack/internal/acse/asn1/* +asn1bean-compiler -o "../src/main/java-gen/" -p "com.beanit.josistack.internal.acse" -f iso-acse-layer.asn -dv + +rm ../src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/* +asn1bean-compiler -o "../src/main/java-gen/" -p "com.beanit.josistack.internal.presentation" -f iso-presentation-layer.asn -dv + +rm -r ../src/main/java-gen/com/beanit/iec61850bean/internal/mms/asn1/* +asn1bean-compiler -o "../src/main/java-gen" -p "com.beanit.iec61850bean.internal.mms" -f mms.asn -dv diff --git a/asn1/iso-acse-layer/iso-acse-layer.asn b/asn1/iso-acse-layer.asn similarity index 100% rename from asn1/iso-acse-layer/iso-acse-layer.asn rename to asn1/iso-acse-layer.asn diff --git a/asn1/iso-acse-layer/compile.sh b/asn1/iso-acse-layer/compile.sh deleted file mode 100755 index a51c82d..0000000 --- a/asn1/iso-acse-layer/compile.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cd `dirname $0` - -rm ../../src/main/java-gen/com/beanit/josistack/internal/acse/asn1/* - -asn1bean-compiler -o "../../src/main/java-gen/" -p "com.beanit.josistack.internal.acse" -f iso-acse-layer.asn -dv diff --git a/asn1/iso-presentation-layer/iso-presentation-layer.asn b/asn1/iso-presentation-layer.asn similarity index 100% rename from asn1/iso-presentation-layer/iso-presentation-layer.asn rename to asn1/iso-presentation-layer.asn diff --git a/asn1/iso-presentation-layer/compile.sh b/asn1/iso-presentation-layer/compile.sh deleted file mode 100755 index d8a0863..0000000 --- a/asn1/iso-presentation-layer/compile.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -cd `dirname $0` - -rm ../../src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/*.java -asn1bean-compiler -o ../../src/main/java-gen/ -p com.beanit.josistack.internal.presentation -f iso-presentation-layer.asn -dv diff --git a/asn1/mms/mms.asn b/asn1/mms.asn similarity index 100% rename from asn1/mms/mms.asn rename to asn1/mms.asn diff --git a/asn1/mms/compile.sh b/asn1/mms/compile.sh deleted file mode 100755 index 36952b4..0000000 --- a/asn1/mms/compile.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cd `dirname $0` - -rm -r ../../src/main/java-gen/com/beanit/iec61850bean/internal/mms/asn1/* - -asn1bean-compiler -o "../../src/main/java-gen" -p "com.beanit.iec61850bean.internal.mms" -f mms.asn -dv diff --git a/asn1/mms/rename-berboolean.sh b/asn1/mms/rename-berboolean.sh deleted file mode 100755 index f806c3b..0000000 --- a/asn1/mms/rename-berboolean.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -cd `dirname $0` - -find ../../ -iname "*.java" | xargs sed -i 's/import com\.beanit\.asn1bean\.ber\.types\.BerBoolean/import com\.beanit\.iec61850bean\.internal\.BerBoolean/g' diff --git a/asn1/readme.txt b/asn1/readme.txt new file mode 100644 index 0000000..147b487 --- /dev/null +++ b/asn1/readme.txt @@ -0,0 +1,10 @@ +steps to follow: + +1) compile classes by executing compile.sh + +2) format everything using IntelliJ + +3) execute replace-berboolean.sh (this step does not work if step 2 +is not executed) + +4) again format everyting using IntelliJ diff --git a/asn1/replace-berboolean.sh b/asn1/replace-berboolean.sh new file mode 100755 index 0000000..7cb65fe --- /dev/null +++ b/asn1/replace-berboolean.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +cd `dirname $0` + +# replace BerBoolean from ASN1bean with special one for IEC 61850 so that true is coded as 0x01 instead of 0xff +find ../ -iname "*.java" | xargs sed -i 's/import com\.beanit\.asn1bean\.ber\.types\.BerBoolean/import com\.beanit\.iec61850bean\.internal\.BerBoolean/g'