From 78b75b4c7c4a515287674f6d74a088fc489b24f8 Mon Sep 17 00:00:00 2001
From: Ghaith Hachem <ghaith.hachem@gmail.com>
Date: Fri, 23 Jun 2023 09:08:43 +0200
Subject: [PATCH] remove the std build scripts and combine them with the
 default script, add release and package builds in worksflow (#879)

---
 .github/workflows/rust.yml            |  46 +--
 Cargo.toml                            |   2 +-
 libs/stdlib/scripts/build.sh          | 448 --------------------------
 libs/stdlib/scripts/common.sh         |  90 ------
 libs/stdlib/scripts/data/offline.toml |  10 -
 scripts/build.sh                      | 177 +++++++++-
 scripts/common.sh                     |  22 ++
 7 files changed, 212 insertions(+), 583 deletions(-)
 delete mode 100755 libs/stdlib/scripts/build.sh
 delete mode 100755 libs/stdlib/scripts/common.sh
 delete mode 100644 libs/stdlib/scripts/data/offline.toml

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a4a8f8dfd2..aaaef8ad23 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -27,7 +27,6 @@ jobs:
     name: Test Linux
     runs-on: ubuntu-latest
     container: ghcr.io/plc-lang/rust-llvm:latest
-    needs: check
     steps:
       - uses: actions/checkout@v3
 
@@ -37,10 +36,33 @@ jobs:
           echo "Build command : ./scripts/build.sh --build --test"
           ./scripts/build.sh --build --test
 
+  package-linux:
+    name: Package Linux
+    runs-on: ubuntu-latest
+    container: ghcr.io/plc-lang/rust-llvm:latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Release Build
+        shell: bash
+        run: |
+          echo "Build command : ./scripts/build.sh --build --release"
+          ./scripts/build.sh --build --release --package \
+          --target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu
+ 
+      - uses: actions/upload-artifact@master
+        with:
+          name: rustyc
+          path: target/release/rustyc
+
+      - uses: actions/upload-artifact@master
+        with:
+          name: stdlib
+          path: output
+
   test-windows:
     name: Test Windows
     runs-on: windows-2022
-    needs: check
     env:
       toolchain-version: 1.70.0
       llvm-version: 14.0.6
@@ -88,29 +110,10 @@ jobs:
           name: rustyc.exe
           path: target/release/rustyc.exe
 
-  package-std:
-    name: Package std
-    runs-on: ubuntu-latest
-    needs: check
-    container: ghcr.io/plc-lang/rust-llvm:latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run Standard libs Build
-        run: |
-          ./libs/stdlib/scripts/build.sh --build --package \
-          --target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu \
-          --release
-
-      - uses: actions/upload-artifact@master
-        with:
-          name: stdlib
-          path: output
-
   style:
     name: Check Style
     runs-on: ubuntu-latest
     container: ghcr.io/plc-lang/rust-llvm:latest
-    needs: check
     steps:
       - uses: actions/checkout@v3
 
@@ -122,7 +125,6 @@ jobs:
     name: Run Coverage 
     runs-on: ubuntu-latest
     container: ghcr.io/plc-lang/rust-llvm:latest
-    needs: check
     steps:
       - uses: actions/checkout@v3
 
diff --git a/Cargo.toml b/Cargo.toml
index 151fde7c50..4ae89bd17a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,4 +59,4 @@ path = "src/main.rs"
 
 [workspace]
 members = ["xtask", "libs/stdlib", "rusty-derive"]
-default-members = [".", "libs/stdlib", "rusty-derive"]
+default-members = ["."]
diff --git a/libs/stdlib/scripts/build.sh b/libs/stdlib/scripts/build.sh
deleted file mode 100755
index 36f96101dc..0000000000
--- a/libs/stdlib/scripts/build.sh
+++ /dev/null
@@ -1,448 +0,0 @@
-#!/bin/bash
-
-# Parse parameters
-vendor=0
-offline=0
-check=0
-check_style=0
-build=0
-doc=0
-test=0
-coverage=0
-release=0
-debug=0
-container=0
-assume_linux=0
-package=0
-target=""
-junit=0
-
-CONTAINER_NAME='rust-llvm'
-
-source "${BASH_SOURCE%/*}/common.sh"
-
-
-function set_cargo_options() {
-	CARGO_OPTIONS="-p iec61131std"
-
-	if [[ $debug -ne 0 ]]; then
-		CARGO_OPTIONS="$CARGO_OPTIONS --verbose"
-	fi
-	if [[ $release -ne 0 ]]; then
-		CARGO_OPTIONS="$CARGO_OPTIONS --release"
-	fi
-	if [[ $offline -ne 0 ]]; then
-		CARGO_OPTIONS="$CARGO_OPTIONS --frozen"
-	fi
-	echo "$CARGO_OPTIONS"
-}
-
-function run_coverage() {
-	CARGO_OPTIONS="+nightly"
-	log "Exporting Flags"
-	export RUSTFLAGS="-Zinstrument-coverage"
-	export LLVM_PROFILE_FILE="rusty-%p-%m.profraw"
-
-	log "Cleaning before build"
-	cargo clean
-	log "Building coverage"
-	cargo $CARGO_OPTIONS build
-	log "Running coverage tests"
-	cargo $CARGO_OPTIONS test
-	log "Collecting coverage results"
-	grcov . --binary-path ./target/debug/ -s . -t lcov --branch \
-		--ignore "/*" \
-		--ignore "src/main.rs" \
-		--ignore "src/*/tests.rs" \
-		--ignore "src/*/tests/*" \
-		--ignore "tests/*" \
-		--ignore "src/lexer/tokens.rs" \
-		--ignore-not-existing -o lcov.info
-}
-
-
-function run_build() {
-	CARGO_OPTIONS=$(set_cargo_options)
-
-	# if the targets are set, we will build once per target
-
-	# Run cargo build with release or debug flags
-	echo "Build starting"
-	echo "-----------------------------------"
-	cmd="cargo build $CARGO_OPTIONS " 
-	if [[ ! -z $target ]]; then
-		for val in ${target//,/ }
-		do
-			new_cmd="$cmd --target=$val" 
-			log "Running $new_cmd" 
-			eval "$new_cmd"
-			echo "-----------------------------------"
-			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
-				echo "Build $val failed"
-				exit 1
-			else
-				echo "Build $val done"
-			fi
-		done
-	else
-		log "Running $cmd" 
-		eval "$cmd"
-		echo "-----------------------------------"
-		if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
-			echo "Build failed"
-			exit 1
-		else
-			echo "Build done"
-		fi
-	fi
-}
-
-function run_check() {
-	CARGO_OPTIONS=$(set_cargo_options)
-  log "Running cargo check"
-	cargo check $CARGO_OPTIONS 
-}
-
-function run_doc() {
-	CARGO_OPTIONS=$(set_cargo_options)
-  log "Running cargo doc"
-	cargo doc $CARGO_OPTIONS 
-	log "Building book"
-	cd book && mdbook build && mdbook test
-}
-
-function run_check_style() {
-	CARGO_OPTIONS=$(set_cargo_options)
-  log "Running cargo clippy"
-	cargo clippy $CARGO_OPTIONS -- -Dwarnings
-  log "Running cargo fmt check"
-	cargo fmt -- --check
-}
-
-function run_test() {
-	CARGO_OPTIONS=$(set_cargo_options)
-	log "Running cargo test"
-	if [[ $junit -ne 0 ]]; then
-		# Switch to nightly
-		rustup default nightly
-		#Delete the test results if they exist
-		rm -rf "$project_location/test_results"
-		make_dir "$project_location/test_results"
-		#Passing through tail here will remove the first line which is currently empty.
-		# Run only the integration tests
-		#https://stackoverflow.com/questions/62447864/how-can-i-run-only-integration-tests
-		cargo test $CARGO_OPTIONS --test '*' -- --format=junit \
-		 -Zunstable-options | tail -n +2 | \
-		 split -l1 - "$project_location"/test_results/std_integration_tests \
-		 -d --additional-suffix=.xml
-		# Switch to stable
-		rustup default stable
-	else
-		cargo test $CARGO_OPTIONS
-	fi
-}
-
-function generate_sources() {
-	log "Collecting 3rd party sources"
-	cargo vendor 3rd-party --versioned-dirs
-	log "Packaging all sources into sources.zip"
-	zip -r sources.zip ./ -x "output/*" -x "target/*" -x ".git/*" -q
-}
-
-function set_offline() {
-	log "Vendor location set, using offline build"
-	log "Copy the offline.toml config to build/.cargo/config.toml"
-	make_dir "$BUILD_DIR"/.cargo
-	cp "$project_location"/scripts/data/offline.toml "$BUILD_DIR"/.cargo/config.toml
-	if [[ ! -d $project_location/3rd-party ]]; then
-		echo "Offline sources not found at $project_location/3rd-party"
-		exit 1
-	fi
-}
-
-function run_package() {
-	cc=$(get_compiler)
-	log "Packaging Standard functions"
-	log "Removing previous output folder"
-	rm -rf $OUTPUT_DIR
-	target_dir="$project_location/target"
-	include_dir=$OUTPUT_DIR/include 
-	make_dir $include_dir
-	#Copy the iec61131-st folder
-	cp -r "$project_location"/libs/stdlib/iec61131-st/*.st "$include_dir"
-
-	if [[ ! -z $target ]]; then
-		for val in ${target//,/ }
-		do
-			lib_dir=$OUTPUT_DIR/$val/lib
-			make_dir $lib_dir
-			rel_dir="$target_dir/$val"
-			if [[ $release -ne 0 ]]; then
-				rel_dir="$rel_dir/release"
-			else 
-				rel_dir="$rel_dir/debug"
-			fi
-			if [[ ! -d "$rel_dir" ]]; then
-				echo "Compilation directory $rel_dir not found"
-				exit 1
-			fi
-			cp "$rel_dir/"*.a "$lib_dir" 2>/dev/null  || log "$rel_dir does not contain *.a files" 
-			# Create an SO file from the copied a file
-			log "Creating a shared library from the compiled static library"
-			log "Running : $cc --shared -L$lib_dir \
-				-Wl,--whole-archive -liec61131std \
-				-o $lib_dir/out.so -Wl,--no-whole-archive \
-				-lm \
-				-fuse-ld=lld \
-				--target=$val"
-			$cc --shared -L"$lib_dir" \
-				-Wl,--whole-archive -liec61131std \
-				-o "$lib_dir/out.so" -Wl,--no-whole-archive \
-				-lm \
-				-fuse-ld=lld \
-				--target="$val"
-			
-			mv "$lib_dir/out.so" "$lib_dir/libiec61131std.so"
-		done
-	else
-		lib_dir=$OUTPUT_DIR/lib
-		make_dir $lib_dir
-		if [[ $release -ne 0 ]]; then
-			rel_dir="$target_dir/release"
-		else 
-			rel_dir="$target_dir/debug"
-		fi
-		cp "$rel_dir/"*.a "$lib_dir" 2>/dev/null || log "$rel_dir does not contain *.a files"
-		# Create an SO file from the copied a file
-		log "Creating a shared library from the compiled static library"
-		log "Running : $cc --shared -L"$lib_dir" \
-			-Wl,--whole-archive -liec61131std \
-			-o "$lib_dir/out.so" -Wl,--no-whole-archive \
-			-lm \
-			-fuse-ld=lld "
-		$cc --shared -L"$lib_dir" \
-			-Wl,--whole-archive -liec61131std \
-			-o "$lib_dir/out.so" -Wl,--no-whole-archive \
-			-lm \
-			-fuse-ld=lld 
-		mv "$lib_dir/out.so" "$lib_dir/libiec61131std.so"
-	fi
-	
-	log "Enabling read/write on the output folder"
-	chmod a+rw $OUTPUT_DIR -R
-
-}
-
-function run_in_container() {
-	container_engine=$(get_container_engine)
-	params=""
-	if [[ $offline -ne 0 ]]; then
-		params="$params --offline"
-	fi
-	if [[ $debug -ne 0 ]]; then
-		params="$params --verbose"
-	fi
-	if [[ $check -ne 0 ]]; then
-		params="$params --check"
-	fi
-	if [[ $check_style -ne 0 ]]; then
-		params="$params --check-style"
-	fi
-	if [[ $build -ne 0 ]]; then
-		params="$params --build"
-	fi
-	if [[ $release -ne 0 ]]; then
-		params="$params --release"
-	fi
-	if [[ $coverage -ne 0 ]]; then
-		params="$params --coverage"
-	fi
-	if [[ $test -ne 0 ]]; then
-		params="$params --test"
-	fi
-	if [[ $doc -ne 0 ]]; then
-		params="$params --doc"
-	fi
-	if [[ $package -ne 0 ]]; then
-		params="$params --package"
-	fi
-     	if [[ $junit -ne 0 ]]; then
-		params="$params --junit"
-	fi
-
-	if [[ ! -z $target ]]; then
-		params="$params --target $target"
-	fi
-
-	volume_target="/build"
-  unameOut="$(uname -s)"
-  case "${unameOut}" in
-  		Linux*)     
-				volume_target="/build"
-				;;
-  		MINGW* | cygwin*)     
-				volume_target="C:\\\\build"
-				;;
-			*)
-				echo "Unsupported os $unameOut"
-				exit 1
-  esac
-
-	build_location=$(sanitize_path "$project_location")
-	log "Sanitized Project location : $project_location"
-
-	command_to_run="$container_engine run -v $build_location:$volume_target $CONTAINER_NAME scripts/build.sh $params"
-	log "Running command : $command_to_run"
-	eval "$command_to_run"
-}
-
-# More safety, by turning some bugs into errors.
-set -o errexit -o pipefail -o noclobber -o nounset
-
-OPTIONS=sorbvc
-LONGOPTS=sources,offline,release,check,check-style,build,doc,test,junit,verbose,container,linux,container-name:,coverage,package,target:
-
-check_env 
-# -activate quoting/enhanced mode (e.g. by writing out “--options”)
-# -pass arguments only via   -- "$@"   to separate them correctly
-! PARSED=$(getopt --options="$OPTIONS" --longoptions="$LONGOPTS" --name "$0" -- "$@")
-if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
-		exit 2
-fi
-
-# read getopt’s output this way to handle the quoting right:
-eval set -- "$PARSED"
-
-while true; do
-		case "$1" in
-			-s|--sources)
-					vendor=1
-					;;
-			-o|--offline)
-					offline=1
-					;;
-			-r|--release)
-					release=1
-					;;
-			-v|--verbose)
-					debug=1
-					;;
-			-c|--container)
-					container=1
-					;;
-			--container-name)
-					shift;
-					CONTAINER_NAME=$1
-					;;
-			--linux)
-					assume_linux=1
-					;;
-			--check-style)
-				  check_style=1
-					;;
-			--doc)
-					doc=1
-					;;
-			--check)
-				  check=1
-					;;
-			-b|--build)
-				  build=1
-					;;
-			--test)
-				  test=1
-					;;
-			--junit)
-			    junit=1
-			    ;;
-			--coverage)
-					coverage=1
-					;;
-			--package)
-					package=1
-					;;
-			--target)
-					shift
-					target=$1
-					;;
-			--)
-					shift
-					break
-					;;
-			*)
-					echo "Programming error"
-					exit 3
-					;;
-		esac
-		shift
-done
-
-project_location=$(find_project_root)
-log "Moving to project level directory $project_location"
-cd "$project_location"
-
-
-if [[ $container -ne 0 ]]; then
-	log "Container Build"
-	run_in_container
-	exit 0
-fi
-
-if [[ $vendor -ne 0 ]]; then
-	generate_sources
-	exit 0
-fi
-
-if [[ $offline -ne 0 ]]; then
-	BUILD_DIR=$project_location/build
-	make_dir "$BUILD_DIR"
-	set_offline
-	log "Moving into $BUILD_DIR"
-	cd "$BUILD_DIR"
-fi
-
-if [[ $package -ne 0 ]]; then
-	OUTPUT_DIR=$project_location/output
-	make_dir "$OUTPUT_DIR"
-fi
-
-if [[ $check -ne 0 ]]; then
-  run_check
-fi
-
-if [[ $check_style -ne 0 ]]; then
-  run_check_style
-fi
-
-if [[ $build -ne 0 ]]; then
-  run_build
-fi
-
-if [[ $test -ne 0 ]]; then
-  run_test
-fi
-
-if [[ $doc -ne 0 ]]; then
-	run_doc
-fi
-
-if [[ $coverage -ne 0 ]]; then
-  run_coverage
-fi
-
-if [[ -d $project_location/target/ ]]; then
-	log "Allow access to target folders"
-	chmod a+rw -R $project_location/target/
-fi
-
-if [[ $package -ne 0 ]]; then
-	run_package
-fi
-
-if [[ $offline -ne 0 ]]; then
-	log "Removing temporary build directory : $BUILD_DIR"
-	rm -rf "$BUILD_DIR"
-fi
-
-echo "Done"
-echo "======================================"
diff --git a/libs/stdlib/scripts/common.sh b/libs/stdlib/scripts/common.sh
deleted file mode 100755
index 38807c1488..0000000000
--- a/libs/stdlib/scripts/common.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-debug=0
-function log() {
-	if [[ $debug -ne 0 ]]; then
-		>&2 echo "$1"
-	fi
-}
-
-function make_dir() {
-if [[ ! -d $1 ]]; then
-	log "Creating a directory at $1"
-	mkdir -p "$1"
-fi
-}
-
-function check_env() {
-	# -allow a command to fail with !’s side effect on errexit
-	# -use return value from ${PIPESTATUS[0]}, because ! hosed $?
-
-	! getopt --test > /dev/null  
-	if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
-			echo 'Error:  extended getopts needed'
-			exit 1
-	fi
-}
-
-function get_compiler() {
-	log "Trying clang"
-	res=
-	if command -v clang &> /dev/null
-	then
-		log "Found clang, using as default"
-		res=clang
-	else
-		log "Trying clang-14"
-		if command -v clang-14 &> /dev/null
-		then
-			log "Found clang, using as default"
-			res=clang-14
-		else 
-			echo 'Error : clang / clang-14 not found'
-			exit 1
-		fi
-	fi
-	log "Compiler found : $res"
-	echo $res
-}
-
-function get_container_engine() {
-	log "Trying docker" 
-	if command -v docker &> /dev/null 
-	then
-		container_engine=docker
-	else
-		>&2 log "Docker not found, trying podman"
-	  if command -v podman &> /dev/null 
-	  then
-	  	container_engine=podman
-	  else
-		  echo "Docker or podman not found"
-		  exit 1
-	  fi
-	fi
-	log "container engine found : $container_engine"
-	echo $container_engine
-}
-
-
-function find_project_root() {
-	log "Locating project root"
-	if command -v cargo &> /dev/null 
-	then
-		log "Using cargo"
-		project_location=$(cargo locate-project --message-format plain)
-		project_location=$(dirname "$project_location")
-	else
-		log "Cargo not found, using script location"
-		project_location="${BASH_SOURCE%/*/..}"
-		project_location=$(dirname $(readlink -f "$project_location"))
-	fi
-	log "Found project location at $project_location"
-	# echo $project_location | tr -t "\\" "\\\\"
-	echo $project_location
-}
-
-function sanitize_path() {
-	target=$1
-	echo "${target//\\/\\\\}"
-}
diff --git a/libs/stdlib/scripts/data/offline.toml b/libs/stdlib/scripts/data/offline.toml
deleted file mode 100644
index ec514c68e0..0000000000
--- a/libs/stdlib/scripts/data/offline.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source."https://github.com/TheDan64/inkwell"]
-git = "https://github.com/TheDan64/inkwell"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "../3rd-party"
diff --git a/scripts/build.sh b/scripts/build.sh
index 107ec1e245..6aec364035 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -16,14 +16,15 @@ container=0
 assume_linux=0
 junit=0
 ci=0
+package=0
+target=""
 
 CONTAINER_NAME='rust-llvm'
 
 source "${BASH_SOURCE%/*}/common.sh"
 
 function set_cargo_options() {
-	CARGO_OPTIONS="--workspace"
-
+	CARGO_OPTIONS=""
 	if [[ $debug -ne 0 ]]; then
 		CARGO_OPTIONS="$CARGO_OPTIONS --verbose"
 	fi
@@ -77,10 +78,48 @@ function run_build() {
 	fi
 }
 
+# Builds with set targets, useful for standard functions
+function run_std_build() {
+	CARGO_OPTIONS=$(set_cargo_options)
+
+	# if the targets are set, we will build once per target
+
+	# Run cargo build with release or debug flags
+	echo "Build starting"
+	echo "-----------------------------------"
+	cmd="cargo build $CARGO_OPTIONS -p iec61131std" 
+	if [[ ! -z $target ]]; then
+		for val in ${target//,/ }
+		do
+			new_cmd="$cmd --target=$val" 
+			log "Running $new_cmd" 
+			eval "$new_cmd"
+			echo "-----------------------------------"
+			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+				echo "Build $val failed"
+				exit 1
+			else
+				echo "Build $val done"
+			fi
+		done
+	else
+		log "Running $cmd" 
+		eval "$cmd"
+		echo "-----------------------------------"
+		if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+			echo "Build failed"
+			exit 1
+		else
+			echo "Build done"
+		fi
+	fi
+}
+
 function run_check() {
 	CARGO_OPTIONS=$(set_cargo_options)
 	log "Running cargo check"
-	cargo check $CARGO_OPTIONS 
+
+	cargo check $CARGO_OPTIONS --workspace
 }
 
 function run_metrics() {
@@ -99,7 +138,7 @@ function run_doc() {
 function run_check_style() {
 	CARGO_OPTIONS=$(set_cargo_options)
 	log "Running cargo clippy"
-	cargo clippy $CARGO_OPTIONS -- -Dwarnings
+	cargo clippy $CARGO_OPTIONS --workspace -- -Dwarnings
 	log "Running cargo fmt check"
 	cargo fmt -- --check
 }
@@ -108,25 +147,42 @@ function run_test() {
 	CARGO_OPTIONS=$(set_cargo_options)
 	log "Running cargo test"
 	if [[ $junit -ne 0 ]]; then
-		# Switch to nightly
-		rustup default nightly
 		#Delete the test results if they exist
 		rm -rf "$project_location/test_results"
 		make_dir "$project_location/test_results"
-		cargo test $CARGO_OPTIONS --lib -- --format=junit \
+		# JUnit test should run on nightly
+		log "cargo +nightly test $CARGO_OPTIONS --lib -- --format=junit \
 			-Zunstable-options \
 		 | split -l1 - "$project_location"/test_results/unit_tests \
 		 -d --additional-suffix=.xml
+		"
+		cargo +nightly test $CARGO_OPTIONS --lib -- --format=junit \
+			-Zunstable-options \
+		 | split -l1 - "$project_location"/test_results/unit_tests \
+		 -d --additional-suffix=.xml
+
 		# Run only the integration tests
 		#https://stackoverflow.com/questions/62447864/how-can-i-run-only-integration-tests
-		cargo test $CARGO_OPTIONS --test '*' -- --format=junit \
+		log "cargo +nightly test $CARGO_OPTIONS --test '*' -- --format=junit \
+		 -Zunstable-options  \
+		 | split -l1 - "$project_location"/test_results/integration_tests \
+		 -d --additional-suffix=.xml"
+		cargo +nightly test $CARGO_OPTIONS --test '*' -- --format=junit \
 		 -Zunstable-options  \
 		 | split -l1 - "$project_location"/test_results/integration_tests \
 		 -d --additional-suffix=.xml
-		# Switch back to stable
-		rustup default stable
+
+		# Run the std integration
+		log "cargo +nightly test $CARGO_OPTIONS -p iec61131std --test '*' -- --format=junit \
+		 -Zunstable-options  \
+		 | split -l1 - "$project_location"/test_results/std_integration_tests \
+		 -d --additional-suffix=.xml"
+		cargo +nightly test $CARGO_OPTIONS -p iec61131std --test '*' -- --format=junit \
+		 -Zunstable-options  \
+		 | split -l1 - "$project_location"/test_results/std_integration_tests \
+		 -d --additional-suffix=.xml
 	else
-		cargo test $CARGO_OPTIONS
+		cargo test $CARGO_OPTIONS --workspace
 	fi
 }
 
@@ -148,6 +204,79 @@ function set_offline() {
 	fi
 }
 
+function run_package_std() {
+	cc=$(get_compiler)
+	log "Packaging Standard functions"
+	log "Removing previous output folder"
+	rm -rf $OUTPUT_DIR
+	target_dir="$project_location/target"
+	include_dir=$OUTPUT_DIR/include 
+	make_dir $include_dir
+	#Copy the iec61131-st folder
+	cp -r "$project_location"/libs/stdlib/iec61131-st/*.st "$include_dir"
+
+	if [[ ! -z $target ]]; then
+		for val in ${target//,/ }
+		do
+			lib_dir=$OUTPUT_DIR/$val/lib
+			make_dir $lib_dir
+			rel_dir="$target_dir/$val"
+			if [[ $release -ne 0 ]]; then
+				rel_dir="$rel_dir/release"
+			else 
+				rel_dir="$rel_dir/debug"
+			fi
+			if [[ ! -d "$rel_dir" ]]; then
+				echo "Compilation directory $rel_dir not found"
+				exit 1
+			fi
+			cp "$rel_dir/"*.a "$lib_dir" 2>/dev/null  || log "$rel_dir does not contain *.a files" 
+			# Create an SO file from the copied a file
+			log "Creating a shared library from the compiled static library"
+			log "Running : $cc --shared -L$lib_dir \
+				-Wl,--whole-archive -liec61131std \
+				-o $lib_dir/out.so -Wl,--no-whole-archive \
+				-lm \
+				-fuse-ld=lld \
+				--target=$val"
+			$cc --shared -L"$lib_dir" \
+				-Wl,--whole-archive -liec61131std \
+				-o "$lib_dir/out.so" -Wl,--no-whole-archive \
+				-lm \
+				-fuse-ld=lld \
+				--target="$val"
+			
+			mv "$lib_dir/out.so" "$lib_dir/libiec61131std.so"
+		done
+	else
+		lib_dir=$OUTPUT_DIR/lib
+		make_dir $lib_dir
+		if [[ $release -ne 0 ]]; then
+			rel_dir="$target_dir/release"
+		else 
+			rel_dir="$target_dir/debug"
+		fi
+		cp "$rel_dir/"*.a "$lib_dir" 2>/dev/null || log "$rel_dir does not contain *.a files"
+		# Create an SO file from the copied a file
+		log "Creating a shared library from the compiled static library"
+		log "Running : $cc --shared -L"$lib_dir" \
+			-Wl,--whole-archive -liec61131std \
+			-o "$lib_dir/out.so" -Wl,--no-whole-archive \
+			-lm \
+			-fuse-ld=lld "
+		$cc --shared -L"$lib_dir" \
+			-Wl,--whole-archive -liec61131std \
+			-o "$lib_dir/out.so" -Wl,--no-whole-archive \
+			-lm \
+			-fuse-ld=lld 
+		mv "$lib_dir/out.so" "$lib_dir/libiec61131std.so"
+	fi
+	
+	log "Enabling read/write on the output folder"
+	chmod a+rw $OUTPUT_DIR -R
+
+}
+
 function run_in_container() {
 	container_engine=$(get_container_engine)
 	params=""
@@ -186,6 +315,12 @@ function run_in_container() {
 	if [[ $doc -ne 0 ]]; then
 		params="$params --doc"
 	fi
+	if [[ $package -ne 0 ]]; then
+		params="$params --package"
+	fi
+	if [[ ! -z $target ]]; then
+		params="$params --target $target"
+	fi
 	if [[ $ci -ne 0 ]]; then
 		options="$options --env=CI_RUN=true"
 	fi
@@ -216,7 +351,7 @@ function run_in_container() {
 set -o errexit -o pipefail -o noclobber -o nounset
 
 OPTIONS=sorbvc
-LONGOPTS=sources,offline,release,check,check-style,metrics,ci,build,doc,test,junit,verbose,container,linux,container-name:,coverage
+LONGOPTS=sources,offline,release,check,check-style,metrics,ci,build,doc,test,junit,verbose,container,linux,container-name:,coverage,package,target:
 
 check_env 
 # -activate quoting/enhanced mode (e.g. by writing out “--options”)
@@ -280,6 +415,13 @@ while true; do
 			--coverage)
 					coverage=1
 					;;
+			--package)
+					package=1
+					;;
+			--target)
+					shift
+					target=$1
+					;;
 			--)
 					shift
 					break
@@ -307,6 +449,11 @@ if [[ $container -ne 0 ]]; then
 	exit 0
 fi
 
+if [[ $package -ne 0 ]]; then
+	OUTPUT_DIR=$project_location/output
+	make_dir "$OUTPUT_DIR"
+fi
+
 if [[ $vendor -ne 0 ]]; then
 	generate_sources
 	exit 0
@@ -334,6 +481,12 @@ fi
 
 if [[ $build -ne 0 ]]; then
 	run_build
+	#Build the standard functions
+	run_std_build
+fi
+
+if [[ $package -ne 0 ]]; then
+	run_package_std
 fi
 
 if [[ $test -ne 0 ]]; then
diff --git a/scripts/common.sh b/scripts/common.sh
index 999169411c..ec6abae1fc 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -25,6 +25,28 @@ function check_env() {
 	fi
 }
 
+function get_compiler() {
+	log "Trying clang"
+	res=
+	if command -v clang &> /dev/null
+	then
+		log "Found clang, using as default"
+		res=clang
+	else
+		log "Trying clang-14"
+		if command -v clang-14 &> /dev/null
+		then
+			log "Found clang, using as default"
+			res=clang-14
+		else 
+			echo 'Error : clang / clang-14 not found'
+			exit 1
+		fi
+	fi
+	log "Compiler found : $res"
+	echo $res
+}
+
 function get_container_engine() {
 	log "Trying docker" 
 	if command -v docker &> /dev/null