Commit 7808df4e authored by Roberto Arturo Homs-Regojo's avatar Roberto Arturo Homs-Regojo Committed by Roberto Arturo Homs-Regojo

[WIP] refactoring sdk version / setId

parent 55d14a60
......@@ -681,6 +681,10 @@
<Filter
Name="doc"
>
<File
RelativePath="..\..\..\..\CMakeLists.txt"
>
</File>
<File
RelativePath="..\..\..\..\cpInstall"
>
......
This diff is collapsed.
############################################################################
# This file is part of LImA, a Library for Image Acquisition
#
# Copyright (C) : 2009-2011
# European Synchrotron Radiation Facility
# BP 220, Grenoble 38043
# FRANCE
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
############################################################################
from Lima import Core
from limapco import Pco as _P
globals().update(_P.__dict__)
############################################################################
# This file is part of LImA, a Library for Image Acquisition
#
# Copyright (C) : 2009-2011
# European Synchrotron Radiation Facility
# BP 220, Grenoble 38043
# FRANCE
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
############################################################################
from Lima import module_helper
mod_path = __path__
depends_on = 'Core'
has_dependent = False
cleanup_data = module_helper.load_prepare(mod_path, depends_on, has_dependent)
from Lima import Core
cleanup_data = module_helper.load_dep_cleanup(cleanup_data)
from Lima.Pco.limapco import Pco as _P
globals().update(_P.__dict__)
module_helper.load_cleanup(cleanup_data)
del mod_path, depends_on, has_dependent, cleanup_data
del module_helper
#define PCO_SDK_VERSION "$Id: PCOSDK [1.20] $"
#define PCO_SDK_RELEASE "1.20"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
#define PCO_SDK_WIN_RELEASE "1.20"
#define PCO_SDK_VERSION "$Id: PCOSDK [pcoDev.1.1.14] $"
#define PCO_SDK_RELEASE "pcoDev.1.1.14"
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_LIN_RELEASE "pcoDev.1.1.14"
......@@ -10,7 +10,8 @@
#======================================================================
FILE="./include/PcoGitVersion.h"
SDK_H="./sdkPco/PcoSdkVersion.h"
SDK_LIN_H="./sdkPco/PcoSdkVersion.h"
SDK_WIN_H="./sdkPcoLin/include/PcoSdkVersion.h"
LOG="./doc/VERSION.log"
DT=`date +"%Y/%m/%d %H:%M:%S"`
......@@ -23,13 +24,14 @@ TANGOREV=`cd ../../applications/tango/python ; git log -n 1 --date=iso --format=
SPECREV=`cd ../../applications/spec ; git log -n 1 --date=iso --format=format:"rev[%ad] head[%h][%H] ref[%d]" HEAD || echo "ERROR"`
{
head -1 ${SDK_H}
echo "#define PCO_GIT_VERSION \"\$Id: PCO ${PCOREV} at [${DT}] \$\""
echo "#define LIMA_GIT_VERSION \"\$Id: LIMA ${LIMAREV} at [${DT}] \$\""
echo "#define PROCLIB_GIT_VERSION \"\$Id: PROCLIB ${PROCLIBREV} at [${DT}] \$\""
echo "#define LIBCONFIG_GIT_VERSION \"\$Id: LIBCONFIG ${LIBCONFIGREV} at [${DT}] \$\""
echo "#define TANGO_GIT_VERSION \"\$Id: TANGO ${TANGOREV} at [${DT}] \$\""
echo "#define SPEC_GIT_VERSION \"\$Id: SPEC ${SPECREV} at [${DT}] \$\""
head -1 ${SDK_WIN_H}
head -1 ${SDK_LIN_H}
echo "#define PCO_GIT_VERSION \"\$Id: PCO ${PCOREV} at [${DT}] \$\""
echo "#define LIMA_GIT_VERSION \"\$Id: LIMA ${LIMAREV} at [${DT}] \$\""
echo "#define PROCLIB_GIT_VERSION \"\$Id: PROCLIB ${PROCLIBREV} at [${DT}] \$\""
echo "#define LIBCONFIG_GIT_VERSION \"\$Id: LIBCONFIG ${LIBCONFIGREV} at [${DT}] \$\""
echo "#define TANGO_GIT_VERSION \"\$Id: TANGO ${TANGOREV} at [${DT}] \$\""
echo "#define SPEC_GIT_VERSION \"\$Id: SPEC ${SPECREV} at [${DT}] \$\""
} > ${FILE}
cat ${FILE}
......
......@@ -90,8 +90,8 @@ pco-objs := \
PcoBinCtrlObj.o \
PcoBufferCtrlObj.o \
PcoCamera.o \
PcoCameraSdkAux.o \
PcoCameraSdk.o \
PcoCameraSdkLin.o \
PcoCameraSip.o \
PcoCameraUtils.o \
PcoDetInfoCtrlObj.o \
......
//###########################################################################
// This file is part of LImA, a Library for Image Acquisition
//
// Copyright (C) : 2009-2012
// European Synchrotron Radiation Facility
// BP 220, Grenoble 38043
// FRANCE
//
// This is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 3 of the License, or
// (at your option) any later version.
//
// This software is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
/**************************************************************************
###########################################################################
This file is part of LImA, a Library for Image Acquisition
Copyright (C) : 2009-2011
European Synchrotron Radiation Facility
BP 220, Grenoble 38043
FRANCE
This is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This software is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
###########################################################################
**************************************************************************/
#include "PcoBinCtrlObj.h"
using namespace lima;
......
This diff is collapsed.
......@@ -562,8 +562,15 @@ void Camera::getSdkRelease(std::string &o_sn)
{
char *ptr = buff;
char *ptrMax = buff + sizeof(buff);
const char* release ;
ptr += sprintf_s(ptr, ptrMax - ptr, PCO_SDK_RELEASE );
#ifdef __linux__
release = PCO_SDK_LIN_RELEASE;
#else
release = PCO_SDK_WIN_RELEASE;
#endif
ptr += sprintf_s(ptr, ptrMax - ptr, release);
o_sn = buff;
}
......
......@@ -1711,7 +1711,15 @@ used to select a different signal, e.g. Status Busy or Status Exposure.
keys_desc[ikey++] = "(R) sdk release";
if(_stricmp(cmd, key) == 0){
ptr += sprintf_s(ptr, ptrMax - ptr, PCO_SDK_RELEASE );
const char* release ;
#ifdef __linux__
release = PCO_SDK_LIN_RELEASE;
#else
release = PCO_SDK_WIN_RELEASE;
#endif
ptr += sprintf_s(ptr, ptrMax - ptr, release );
return output;
}
......@@ -2289,7 +2297,7 @@ char * _getPcoSdkVersion(char *infoBuff, int strLen, char *lib)
nr = sprintf_s(ptr, strLen, "file[%s] ver[%d.%d.%d]\n", lib, ima, imi, imb);
}
#else
sprintf_s(ptr, strLen, PCO_SDK_RELEASE);
sprintf_s(ptr, strLen, PCO_SDK_LIN_RELEASE);
#endif
return infoBuff ;
......
/**************************************************************************
###########################################################################
This file is part of LImA, a Library for Image Acquisition
Copyright (C) : 2009-2011
European Synchrotron Radiation Facility
BP 220, Grenoble 38043
FRANCE
This is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This software is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
###########################################################################
**************************************************************************/
//=========================================================================================================
//=========================================================================================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment