From ba7fec4bde7f27201fcae30edaf2ed1842e90b81 Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Wed, 10 Aug 2022 14:55:33 +0200
Subject: [PATCH] f4pga/wrappers: rm pack.f4pga.sh

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 f4pga/wrappers/sh/__init__.py              | 10 ++++++-
 f4pga/wrappers/sh/quicklogic/pack.f4pga.sh | 31 ----------------------
 f4pga/wrappers/sh/xc7/pack.f4pga.sh        | 27 -------------------
 3 files changed, 9 insertions(+), 59 deletions(-)
 delete mode 100755 f4pga/wrappers/sh/quicklogic/pack.f4pga.sh
 delete mode 100755 f4pga/wrappers/sh/xc7/pack.f4pga.sh

diff --git a/f4pga/wrappers/sh/__init__.py b/f4pga/wrappers/sh/__init__.py
index e0325b0..9009741 100644
--- a/f4pga/wrappers/sh/__init__.py
+++ b/f4pga/wrappers/sh/__init__.py
@@ -60,7 +60,15 @@ def generate_constraints():
 
 def pack():
     print("[F4PGA] Running (deprecated) pack")
-    run_sh(ROOT / SH_SUBDIR / "pack.f4pga.sh")
+    extra_args = ['--write_block_usage', 'block_usage.json'] if isQuickLogic else []
+    check_call(f"""
+set -e
+source {ROOT / SH_SUBDIR}/vpr_common.f4pga.sh
+parse_args {' '.join(sys_argv[1:])}
+export OUT_NOISY_WARNINGS=noisy_warnings-${{DEVICE}}_pack.log
+run_vpr --pack {' '.join(extra_args)}
+mv vpr_stdout.log pack.log
+""", env=f4pga_environ, shell=True, executable='/bin/bash')
 
 
 def place():
diff --git a/f4pga/wrappers/sh/quicklogic/pack.f4pga.sh b/f4pga/wrappers/sh/quicklogic/pack.f4pga.sh
deleted file mode 100755
index 705a5ce..0000000
--- a/f4pga/wrappers/sh/quicklogic/pack.f4pga.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (C) 2020-2022 F4PGA Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-source $(dirname "$0")/vpr_common.f4pga.sh
-parse_args $@
-
-export OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_pack.log
-
-run_vpr \
-  --pack \
-  --write_block_usage \
-  block_usage.json
-
-mv vpr_stdout.log pack.log
diff --git a/f4pga/wrappers/sh/xc7/pack.f4pga.sh b/f4pga/wrappers/sh/xc7/pack.f4pga.sh
deleted file mode 100755
index 48d0ecb..0000000
--- a/f4pga/wrappers/sh/xc7/pack.f4pga.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (C) 2020-2022 F4PGA Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-source $(dirname "$0")/vpr_common.f4pga.sh
-parse_args "$@"
-
-export OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_pack.log
-
-run_vpr --pack
-mv vpr_stdout.log pack.log