Commit 6ea3c1b8 authored by Marco Buttu's avatar Marco Buttu
Browse files

Fix #118: rename TARGETSYS to STATION

parent 546ef50f

Common/Servers/ReceiversBoss/src/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
# user definable C-compilation flags

# a quick comment on this: in order to control receivers a t med the boss is in charge of doing much more things that it has to. So

# different code is required until new specific component to control the receivers for Medicina are written

ifeq ($(TARGETSYS),MED)

ifeq ($(STATION),Medicina)

	USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_MED'

else ifeq ($(TARGETSYS),NT)

else ifeq ($(STATION),Noto)

	USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD'

else

	USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD'
@@ -50,7 +50,7 @@ EXECUTABLES_L = 
# <brief description of xxxxx program>

ReceiversBossImpl_OBJECTS   = ReceiversBossImpl	RecvBossCore Configuration WatchingThread

ReceiversBossImpl_LDFLAGS   =

ifeq ($(TARGETSYS),NT)

ifeq ($(STATION),Noto)

	ReceiversBossImpl_LIBS      = IRALibrary ComponentErrors CommonReceiverInterfaceStubs ReceiversBossStubs ReceiversDefinitionsStubs AntennaDefinitionsStubs GenericReceiverStubs \

				      DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc \

				      BackendsDefinitionsStubs TotalPowerStubs GenericBackendStubs BackendsErrors bulkDataStubs bulkDataReceiverStubs \

Common/Servers/XBackend/src/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 


# a quick comment on this: in order to control the Medicina version of the backend a small change of the code is required so I force the

# definition of a symbol that can be used by the c++ precompiler.

ifeq ($(TARGETSYS),MED)

ifeq ($(STATION),Medicina)

	USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_MED'

else ifeq ($(TARGETSYS),NT)

else ifeq ($(STATION),Noto)

	USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_MED' -D 'COMPILE_TARGET_NT'

else

	USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD'

SRT/Misc/SRTEnv/src/.nuraghe/nuragherc

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ export NURAGHETAG=0.4 
export NURAGHEBRANCH=DerotatorAndMinorServo



# Set the SVN environment

export TARGETSYS=SRT

export STATION=SRT

export SYSLOCATION=$NURAGHEROOT/ACS/trunk/

export SYSTEM_SVN_TAG=nuraghe-$NURAGHETAG

export SVNUSER=gavino

SystemBuild/install_stable_build.sh

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ if [ -d "$DISCOS_CDB" ]; then 
    echo "replacing $ACS_CDB with $DISCOS_CDB"

    ACS_CDB=$DISCOS_CDB

fi

NEW_INTROOT=${INTROOT_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE

NEW_CDB=${CDB_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE

NEW_INTROOT=${INTROOT_PREFIX}/${STATION}/${REPO_VERSION}/STABLE

NEW_CDB=${CDB_PREFIX}/${STATION}/${REPO_VERSION}/STABLE

rm -rf $NEW_INTROOT

rm -rf $NEW_CDB

mkdir -p $NEW_INTROOT
@@ -14,4 +14,4 @@ cp -r $INTROOT/* $NEW_INTROOT/ 
mkdir -p $NEW_CDB

chmod -R u+rwx $NEW_CDB

cp -r ${ACS_CDB}/CDB ${NEW_CDB}/

echo "Installed new stable version of $TARGETSYS"
 
echo "Installed new stable version of $STATION"

SystemBuild/package_stable_release.sh

+6 −6
Original line number Diff line number Diff line 
#!/bin/bash -ex

BASENAME=`basename ${REPO_VERSION}`

BASEDIR=discos/${TARGETSYS}/${BASENAME}

BASEDIR=discos/${STATION}/${BASENAME}

BUILDINFO=${BASEDIR}/buildinfo.txt

BASHRC=${BASEDIR}/bashrc

source ~/.bashrc
@@ -12,8 +12,8 @@ rm -rf discos 
mkdir -p ${BASEDIR}/introot

mkdir -p ${BASEDIR}/cdb

chown -R manager:acs ${BASEDIR}

cp -r ${INTROOT_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE/* ${BASEDIR}/introot/

cp -r ${CDB_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE/* ${BASEDIR}/cdb/

cp -r ${INTROOT_PREFIX}/${STATION}/${REPO_VERSION}/STABLE/* ${BASEDIR}/introot/

cp -r ${CDB_PREFIX}/${STATION}/${REPO_VERSION}/STABLE/* ${BASEDIR}/cdb/

touch ${BUILDINFO}

printf "build id:\t${BUILD_ID}\n" >> ${BUILDINFO}

printf "build number:\t${BUILD_DISPLAY_NAME}\n" >> ${BUILDINFO}
@@ -25,11 +25,11 @@ printf "* Azdora build parameters *\n" >> ${BUILDINFO 
printf "******************************************************\n" >> ${BUILDINFO}

printf "INTROOT_PREFIX:\t${INTROOT_PREFIX}\n" >> ${BUILDINFO}

printf "CDB_PREFIX:\t${CDB_PREFIX}\n" >> ${BUILDINFO}

printf "TARGETSYS:\t${TARGETSYS}\n" >> ${BUILDINFO}

printf "STATION:\t${STATION}\n" >> ${BUILDINFO}

printf "REPO_VERSION:\t${REPO_VERSION}\n" >> ${BUILDINFO}

touch ${BASHRC}

printf "export INTROOT=/${BASEDIR}/introot\n" >> ${BASHRC}

printf "export ACS_CDB=/${BASEDIR}/cdb\n" >> ${BASHRC}

printf "export TARGETSYS=${TARGETSYS}\n" >> ${BASHRC}

printf "export STATION=${STATION}\n" >> ${BASHRC}

printf "export REPO_VERSION=${REPO_VERSION}\n" >> ${BASHRC}

tar czvf discos-${TARGETSYS}-${BASENAME}-b${BUILD_NUMBER}.tar.gz discos
 
tar czvf discos-${STATION}-${BASENAME}-b${BUILD_NUMBER}.tar.gz discos