Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
conda-recipes
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
LimaGroup
conda-recipes
Commits
0f0b894a
Commit
0f0b894a
authored
7 years ago
by
Jose Tiago Macara Coutinho
Browse files
Options
Downloads
Patches
Plain Diff
Second try at SVN proxy
parent
852402f5
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+3
-2
3 additions, 2 deletions
.gitlab-ci.yml
tango-serial/Makefile
+6
-12
6 additions, 12 deletions
tango-serial/Makefile
tango-serial/build.sh
+3
-6
3 additions, 6 deletions
tango-serial/build.sh
tango-serial/svn_servers
+0
-4
0 additions, 4 deletions
tango-serial/svn_servers
with
12 additions
and
24 deletions
.gitlab-ci.yml
+
3
−
2
View file @
0f0b894a
before_script
:
-
source /opt/miniconda/bin/activate
-
mkdir -p ~/.subversion
-
echo -e "[global]\nhttp-proxy-host=proxy.esrf.fr\nhttp-proxy-port=3128" > ~/.subversion/servers
build
:
stage
:
build
script
:
-
cd $CI_COMMIT_REF_NAME
-
conda build . --prefix-length=80 --output-folder=../dist/ --python=2.7 --channel=file://conda
# - conda build . --prefix-length=80 --output-folder=../dist/ --python=3.6 --channel=file://conda
-
conda build . --prefix-length=80 --output-folder=../dist --channel=file://conda
artifacts
:
paths
:
-
dist/
...
...
This diff is collapsed.
Click to expand it.
tango-serial/Makefile
+
6
−
12
View file @
0f0b894a
CXX
?=
c++
PREFIX
?=
/usr/local
CLASS
=
Serial
ifdef
PREFIX
INCDIR
=
-I
$(
PREFIX
)
/include
-I
$(
PREFIX
)
/include/tango
LIBDIR
=
-L
$(
PREFIX
)
/lib
else
INCDIR
=
LIBDIR
=
endif
OBJ
=
$(
CLASS
)
.o
\
$(
CLASS
)
Class.o
\
$(
CLASS
)
StateMachine.o
\
...
...
@@ -18,11 +11,12 @@ OBJ = $(CLASS).o \
DEPS
=
$(
CLASS
)
.h
\
$(
CLASS
)
Class.h
CXXFLAGS
=
-g
-std
=
c++0x
-D_REENTRANT
-I
.
$(
INCDIR
)
CXXFLAGS
=
-g
-std
=
c++0x
-D_REENTRANT
\
-I
.
-I
$(
PREFIX
)
/include
-I
$(
PREFIX
)
/include/tango
LFLAGS
=
-ltango
-llog4tango
\
LFLAGS
=
-L
$(
PREFIX
)
/lib
\
-ltango
-llog4tango
\
-lomniORB4
-lomniDynamic4
-lomnithread
-lCOS4
-lzmq
\
$(
LIBDIR
)
%.o
:
%.cpp $(DEPS)
$(
CXX
)
$(
CXXFLAGS
)
-c
-o
$@
$<
...
...
@@ -31,7 +25,7 @@ $(CLASS): $(OBJ)
$(
CXX
)
-o
$(
CLASS
)
$^
$(
LFLAGS
)
install
:
$(CLASS)
cp
$(
CLASS
)
/usr/local
/bin
cp
$(
CLASS
)
$(
PREFIX
)
/bin
.PHONY
:
install clean
...
...
This diff is collapsed.
Click to expand it.
tango-serial/build.sh
+
3
−
6
View file @
0f0b894a
export
CC
=
${
PREFIX
}
/bin/gcc
export
CXX
=
${
PREFIX
}
/bin/g++
mkdir
-p
~/.subversion
cp
svn_servers ~/.subversion/servers
cd
src
cp
${
RECIPE_DIR
}
/Makefile
.
make
-j4
make
install
cp
${
RECIPE_DIR
}
/Makefile src/
make
-C
src/
-j4
make
-C
src/
install
This diff is collapsed.
Click to expand it.
tango-serial/svn_servers
deleted
100644 → 0
+
0
−
4
View file @
852402f5
[global]
http-proxy-host = proxy.esrf.fr
http-proxy-port = 3128
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment