From b5054a0023137f9260bf9ddc94a588f7ad01cdb3 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Thu, 3 May 2012 17:25:32 +0000 Subject: [PATCH] Modification to be able to run after packaging. --- .../documentation/alliance-examples/go-all.sh | 38 ++++++++++++++----- .../alliance-examples/mipsR3000/sce/Makefile | 11 +++--- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/alliance/src/documentation/alliance-examples/go-all.sh b/alliance/src/documentation/alliance-examples/go-all.sh index 84247d6c..fc755042 100644 --- a/alliance/src/documentation/alliance-examples/go-all.sh +++ b/alliance/src/documentation/alliance-examples/go-all.sh @@ -1,11 +1,31 @@ #!/bin/sh -for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \ - multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \ - mipsR3000 -do - if [ -d $B ] - then echo "----- BENCH $B ----- " - (cd $B && make clean && make ALLIANCE_EXAMPLES=/dsk/l1/alliance/alliance/src/documentation/alliance-examples) - fi -done + if [ -z "$ALLIANCE_TOP" ]; then + ALLIANCE_TOP="${HOME}/alliance/Linux.slsoc6x/install" + fi + if [ "$ALLIANCE_TOP" != "/usr/lib/alliance" ]; then + ALLIANCE_BIN=${ALLIANCE_TOP}/bin + CELLS_TOP=${ALLIANCE_TOP}/cells + else + ALLIANCE_BIN=/usr/bin + CELLS_TOP=/usr/share/alliance/cells + fi + TARGET_LIB=${CELLS_TOP}/sxlib + + export ALLIANCE_BIN CELLS_TOP TARGET_LIB + + for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \ + multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \ + mipsR3000 + do + if [ -d $B ]; then + echo "----- BENCH $B ----- " + (cd $B && \ + make clean && \ + make ALLIANCE_BIN=${ALLIANCE_BIN} \ + CELLS_TOP=${CELLS_TOP} \ + TARGET_LIB=${TARGET_LIB} \ + ALLIANCE_EXAMPLES=/dsk/l1/alliance/alliance/src/documentation/alliance-examples \ + ) + fi + done diff --git a/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile b/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile index ca4c22fc..79978741 100644 --- a/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile +++ b/alliance/src/documentation/alliance-examples/mipsR3000/sce/Makefile @@ -6,6 +6,7 @@ # Standart Alliance binary access paths. ALLIANCE_BIN = $(ALLIANCE_TOP)/bin + CELLS_TOP = $(ALLIANCE_TOP)/cells ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples @@ -34,12 +35,12 @@ ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples EXTRACT_PH = ap GENERAT_SP = . EXTRACT_SP = . - CATA_LIB0 = $(ALLIANCE_TOP)/cells/sxlib - CATA_LIB1 = $(ALLIANCE_TOP)/cells/dp_sxlib - CATA_LIB2 = $(ALLIANCE_TOP)/cells/padlib - CATA_LIB3 = $(ALLIANCE_TOP)/cells/rflib + CATA_LIB0 = $(CELLS_TOP)/sxlib + CATA_LIB1 = $(CELLS_TOP)/dp_sxlib + CATA_LIB2 = $(CELLS_TOP)/padlib + CATA_LIB3 = $(CELLS_TOP)/rflib CATA_LIB = .:$(CATA_LIB0):$(CATA_LIB1):$(CATA_LIB2):$(CATA_LIB3) - TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib + TARGET_LIB = $(CELLS_TOP)/sxlib FPGEN_LIB = $(CATA_LIB0):$(CATA_LIB1) TECHNO_NAME = local-cmos CARAC_TECHNO_NAME = local-cmos-035