Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-frelon
Commits
2e7e57fa
Commit
2e7e57fa
authored
Mar 31, 2022
by
Laurent Claustre
Browse files
support to py38/py37 and latest sip 4.19
parent
2fde05e4
Pipeline
#70980
failed with stages
in 2 minutes and 34 seconds
Changes
13
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
2e7e57fa
...
...
@@ -14,19 +14,19 @@ stages:
build-linux
:
<<
:
*build-conda
script
:
-
conda build ./conda/camera --prefix-length=80 --output-folder=dist/
-c conda-forge
--channel=http://bcu-ci.esrf.fr/stable
-
conda
mamba
build ./conda/camera --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
tags
:
-
cos7
-
linux
build-noarch
:
<<
:
*build-conda
stage
:
build-noarch
script
:
-
conda build ./conda/tango --prefix-length=80 --output-folder=dist/
-c tango-controls
--channel=http://bcu-ci.esrf.fr/stable
-
conda
mamba
build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
dependencies
:
-
build-linux
tags
:
-
cos7
-
linux
deploy-devel
:
stage
:
deploy
...
...
@@ -41,7 +41,7 @@ deploy-devel:
-
conda index /conda-devel/
tags
:
-
conda
-
cos7
-
linux
only
:
-
branches
except
:
...
...
@@ -61,6 +61,6 @@ deploy-stable:
-
conda index /conda/
tags
:
-
conda
-
cos7
-
linux
only
:
-
tags
conda/camera/build.sh
View file @
2e7e57fa
#!/bin/bash
cmake
-Bbuild
-H
.
-DLIMA_ENABLE_PYTHON
=
1
-DCAMERA_ENABLE_TESTS
=
1
-DCMAKE_INSTALL_PREFIX
=
$PREFIX
-DPYTHON_SITE_PACKAGES_DIR
=
$SP_DIR
-DCMAKE_FIND_ROOT_PATH
=
$PREFIX
cmake
-Bbuild
-H
.
-GNinja
-DLIMA_ENABLE_PYTHON
=
1
-DCAMERA_ENABLE_TESTS
=
1
-DCMAKE_INSTALL_PREFIX
=
$PREFIX
-DCMAKE_FIND_ROOT_PATH
=
$PREFIX
cmake
--build
build
--target
install
conda/camera/conda_build_config.yaml
View file @
2e7e57fa
...
...
@@ -6,6 +6,8 @@ cxx_compiler:
-
vs2017
# [win]
python
:
-
3.7
-
3.8
-
3.9
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
...
...
conda/camera/meta.yaml
View file @
2e7e57fa
...
...
@@ -18,16 +18,16 @@ build:
requirements
:
host
:
-
python {{ python }}
-
sip 4.19
.8
# For compatibility with pyqt 5.9.2
-
sip 4.19
*
# API v12.7
-
lima-core
-
lima-common-espia
build
:
-
cmake
-
make
-
ninja
-
{{
compiler('cxx')
}}
run
:
-
python
-
sip >=4.19.4, <=4.19.8
# For compatibility with pyqt 5.9.2
-
{{
pin_compatible('sip'
,
min_pin='x.x.x'
,
max_pin='x')
}}
-
{{
pin_compatible('lima-core'
,
max_pin='x.x')
}}
-
lima-common-espia
...
...
conda/tango/bld.bat
View file @
2e7e57fa
cd
tango
cmake
-Bbuild -H
.
-DCMAKE
_INSTALL_PREFIX
=
%LIBRARY_PREFIX%
-DPYTHON
_SITE_PACKAGES_DIR
=
%SP_DIR%
-DCMAKE
_FIND_ROOT_PATH
=
%LIBRARY_PREFIX%
cmake
-Bbuild -H
.
-GNinja
-DCMAKE
_INSTALL_PREFIX
=
%LIBRARY_PREFIX%
-DCMAKE
_FIND_ROOT_PATH
=
%LIBRARY_PREFIX%
IF
%ERRORLEVEL%
NEQ
0
exit
/b
%ERRORLEVEL%
cmake
--build
build
--config
Release
--target
install
...
...
conda/tango/build.sh
View file @
2e7e57fa
#!/bin/bash
cd
tango/
cmake
-Bbuild
-H
.
-DCMAKE_INSTALL_PREFIX
=
$PREFIX
-DPYTHON_SITE_PACKAGES_DIR
=
$SP_DIR
-DCMAKE_FIND_ROOT_PATH
=
$PREFIX
cmake
-Bbuild
-H
.
-GNinja
-DCMAKE_INSTALL_PREFIX
=
$PREFIX
-DCMAKE_FIND_ROOT_PATH
=
$PREFIX
cmake
--build
build
--target
install
conda/tango/meta.yaml
View file @
2e7e57fa
...
...
@@ -19,8 +19,7 @@ build:
requirements
:
build
:
-
cmake
-
make
-
git
-
ninja
-
lima-core
run
:
-
lima-tango-server
...
...
sip/FrelonCamera.sip
View file @
2e7e57fa
...
...
@@ -134,6 +134,9 @@ class Camera
void unregisterDeadTimeChangedCallback(Frelon::DeadTimeChangedCallback& cb);
void registerMaxImageSizeCallback(HwMaxImageSizeCallback& cb);
void unregisterMaxImageSizeCallback(HwMaxImageSizeCallback& cb);
private:
Camera(const Frelon::Camera&);
};
...
...
sip/FrelonCorrection.sip
View file @
2e7e57fa
...
...
@@ -41,6 +41,9 @@ using namespace lima;
void getHwRoi(Roi& hw_roi /Out/);
virtual Data process(Data& data);
private:
E2VCorrection(const Frelon::E2VCorrection&);
};
}; // namespace Frelon
...
...
sip/FrelonGeometry.sip
View file @
2e7e57fa
...
...
@@ -36,6 +36,9 @@ public:
protected:
virtual void deadTimeChanged(double dead_time) = 0;
private:
DeadTimeChangedCallback(const Frelon::DeadTimeChangedCallback&);
};
...
...
sip/FrelonInterface.sip
View file @
2e7e57fa
...
...
@@ -41,6 +41,9 @@ class AcqEndCallback : Espia::AcqEndCallback
protected:
virtual void acqFinished(const HwFrameInfoType& /*finfo*/);
private:
AcqEndCallback(Frelon::AcqEndCallback&);
};
...
...
@@ -58,6 +61,9 @@ class EventCallback : EventCallback
protected:
virtual void processEvent(Event *event);
private:
EventCallback(const Frelon::EventCallback&);
};
...
...
@@ -88,6 +94,9 @@ class DetInfoCtrlObj : HwDetInfoCtrlObj
HwMaxImageSizeCallback& cb);
virtual void unregisterMaxImageSizeCallback(
HwMaxImageSizeCallback& cb);
private:
DetInfoCtrlObj(const Frelon::DetInfoCtrlObj&);
};
...
...
@@ -123,6 +132,8 @@ class BufferCtrlObj : HwBufferCtrlObj
virtual void registerFrameCallback(HwFrameCallback& frame_cb);
virtual void unregisterFrameCallback(HwFrameCallback& frame_cb);
private:
BufferCtrlObj(const Frelon::BufferCtrlObj&);
};
...
...
@@ -153,6 +164,8 @@ class SyncCtrlObj : HwSyncCtrlObj
virtual void getValidRanges(HwSyncCtrlObj::ValidRangesType& valid_ranges /Out/);
private:
SyncCtrlObj(const Frelon::SyncCtrlObj&);
};
...
...
@@ -170,6 +183,9 @@ class BinChangedCallback
protected:
virtual void hwBinChanged(const Bin& hw_bin) = 0;
private:
BinChangedCallback(const Frelon::BinChangedCallback&);
};
...
...
@@ -191,6 +207,9 @@ class BinCtrlObj : HwBinCtrlObj
void registerBinChangedCallback (Frelon::BinChangedCallback& chg_cb);
void unregisterBinChangedCallback(Frelon::BinChangedCallback& chg_cb);
private:
BinCtrlObj(const Frelon::BinCtrlObj&);
};
...
...
@@ -208,6 +227,9 @@ class RoiChangedCallback
protected:
virtual void hwRoiChanged(const Roi& hw_roi) = 0;
private:
RoiChangedCallback(const Frelon::RoiChangedCallback&);
};
...
...
@@ -229,6 +251,10 @@ class RoiCtrlObj : HwRoiCtrlObj
void registerRoiChangedCallback (Frelon::RoiChangedCallback& chg_cb);
void unregisterRoiChangedCallback(Frelon::RoiChangedCallback& chg_cb);
private:
RoiCtrlObj(const Frelon::RoiCtrlObj&);
};
...
...
@@ -246,7 +272,11 @@ class FlipCtrlObj : HwFlipCtrlObj
virtual void setFlip(const Flip& flip);
virtual void getFlip(Flip& flip /Out/);
virtual void checkFlip(Flip& flip /In,Out/);
private:
FlipCtrlObj(const Frelon::FlipCtrlObj&);
};
...
...
@@ -258,7 +288,7 @@ class ShutterCtrlObj : HwShutterCtrlObj
#include <algorithm>
%End
public:
public:
ShutterCtrlObj(Frelon::Camera& cam);
virtual ~ShutterCtrlObj();
...
...
@@ -275,6 +305,8 @@ public:
virtual void setCloseTime(double shut_close_time);
virtual void getCloseTime(double& shut_close_time /Out/);
private:
ShutterCtrlObj(const Frelon::ShutterCtrlObj&);
};
...
...
@@ -286,9 +318,12 @@ class EventCtrlObj : HwEventCtrlObj
#include <algorithm>
%End
public:
public:
EventCtrlObj();
virtual ~EventCtrlObj();
private:
EventCtrlObj(const Frelon::EventCtrlObj&);
};
...
...
@@ -333,6 +368,9 @@ class Interface : HwInterface
break;
}
%End
private:
Interface(const Frelon::Interface&);
};
...
...
sip/FrelonModel.sip
View file @
2e7e57fa
...
...
@@ -49,6 +49,9 @@ class Firmware
static const Frelon::Firmware v3_0i;
static const Frelon::Firmware v3_1c;
static const Frelon::Firmware v4_1;
private:
Firmware(const Frelon::Firmware&);
};
...
...
@@ -96,7 +99,9 @@ class Model
double getPixelSize();
std::string getName();
private:
Model(const Frelon::Model&);
};
}; // namespace Frelon
sip/FrelonSerialLine.sip
View file @
2e7e57fa
...
...
@@ -103,6 +103,9 @@ class SerialLine : HwSerialLine
void getCacheActive(bool& cache_act /Out/);
void getResetTraceLog(std::vector<std::string>& reset_trace_log /Out/);
private:
SerialLine(const Frelon::SerialLine&);
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment