Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix dependencies. #4

Merged
merged 69 commits into from
Feb 21, 2019
Merged
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
39b8d52
Revert "PLYReader: thread safe colors"
taketwo Jul 2, 2017
14c7280
Bump version to 1.8.1
taketwo Jul 2, 2017
0ff1d12
Add new gtest path
jspricke Jul 2, 2017
26803fb
Fix issue with finding pcl deployed out of path (#1923)
SergioRAgostinho Jul 4, 2017
1c35f48
Fix issue #1674
anuppari Jul 5, 2017
81b56e3
Added CUDA compute capability 5.3
haueck Jul 7, 2017
d080f67
Update Ensenso tutorial for Ensenso X devices
VictorLamoine Jul 10, 2017
fbfee18
need to include instantiate.hpp to use PCL_INSTANTIATE
eisoku9618 Jul 19, 2017
7ee6471
Fixed error in documentation.
IgniparousTempest Aug 3, 2017
a83bb1e
Fixed spelling and grammar errors
IgniparousTempest Aug 4, 2017
a7ff652
Add test for macro _USE_MATH_DEFINES.
ShiningPluto Aug 3, 2017
39732f5
Final changelist update for 1.8.1
taketwo Aug 8, 2017
217fd22
Fix: Install cuda based filters (#1)
DrCodeWizzard Oct 18, 2017
0a4d1c9
feat: Add install step for io buffers.
dantwinkler Oct 30, 2017
1aa002d
fix: Build on circleci.
dantwinkler Dec 2, 2017
465eead
fix: Add build job.
dantwinkler Dec 2, 2017
7c7f24e
fix: Fix circleci project.
dantwinkler Dec 2, 2017
b76296f
fix: Fix docker image name.
dantwinkler Dec 2, 2017
dea804c
fix: Build using correct docker image.
dantwinkler Dec 2, 2017
034b08c
fix: Correct env variable name.
dantwinkler Dec 2, 2017
32cb175
fix: Fixed build script.
dantwinkler Dec 2, 2017
9883888
fix: Fix build image name.
dantwinkler Dec 2, 2017
37a7524
fix: Add directories to .gitignore.
dantwinkler Dec 2, 2017
c8767d3
fix: remove circle
joshughes Feb 3, 2018
b066176
fix: add x permissions
joshughes Feb 3, 2018
25f31e9
fix: build
joshughes Feb 3, 2018
e7fa0a2
fix: upload artifact
joshughes Feb 3, 2018
a5aff79
fix: FPM
joshughes Feb 3, 2018
7b6034f
fix: FPM
joshughes Feb 3, 2018
d4123c1
fix: permissions
joshughes Feb 3, 2018
6f30b61
fix: semver
joshughes Feb 3, 2018
246990c
fix: get version
joshughes Feb 3, 2018
66fddff
fix: github repo for semrel
joshughes Feb 3, 2018
29830b7
fix: make install
joshughes Feb 3, 2018
52c1563
Merge pull request #2 from 6RiverSystems/jenkins
joshughes Feb 4, 2018
80eb6e9
fix: Slim down pcl (no cuda).
dantwinkler Apr 23, 2018
79b45fd
fix: Fix build scripts.
dantwinkler Apr 23, 2018
0a9b6f6
fix: Add missing build step.
dantwinkler Apr 23, 2018
e96f658
fix: Fix package name and repo folder.
dantwinkler Apr 23, 2018
778795f
fix: Fix package name and repo folder.
dantwinkler Apr 23, 2018
2e3cd56
fix: Add features.
dantwinkler Apr 23, 2018
c377f06
fix: Add surface.
dantwinkler Apr 23, 2018
ff4f8c9
fix: Use default build settings.
dantwinkler Apr 23, 2018
4f929c6
fix: Turn off VTK.
dantwinkler Apr 23, 2018
7075bb4
fix: Force rebuild.
dantwinkler Apr 23, 2018
66ad998
fix: Fix build.
dantwinkler Apr 23, 2018
078efc6
fix: Fix build.
dantwinkler Apr 23, 2018
5d617aa
fix: Fix build.
dantwinkler Apr 23, 2018
d1b451e
fix: Fix build.
dantwinkler Apr 23, 2018
224faa2
fix: Smaller pcl library.
dantwinkler May 9, 2018
48e7bc1
fix: Fix build.
dantwinkler May 9, 2018
b2466cf
fix: Remove sudo.
dantwinkler May 9, 2018
c44b24f
fix: Fix build scripts.
dantwinkler May 9, 2018
39d38eb
fix: Fix build scripts.
dantwinkler May 9, 2018
401b4ce
fix: Fix build scripts.
dantwinkler May 9, 2018
18a05a3
fix: Fix build scripts.
dantwinkler May 9, 2018
36072e1
fix: Fix build scripts.
dantwinkler May 9, 2018
87f7868
fix: Add qhull and png libraries.
dantwinkler May 9, 2018
dc27b88
fix: Add zlib library.
dantwinkler May 9, 2018
a483684
fix: Remove workspace.
dantwinkler Jun 24, 2018
d366572
fix: Clean up build script and fix depends.
dantwinkler Jun 24, 2018
899f0d4
fix: Use ccache.
dantwinkler Jun 24, 2018
4e3d60f
fix: Fix build permissions.
dantwinkler Jun 24, 2018
5dd09bc
fix: Remove jessie build.
dantwinkler Jun 24, 2018
54f859e
fix: Merge remote-tracking branch 'origin/master' into fix/dependencies
dantwinkler Feb 14, 2019
9af978e
fix: Use default step
dantwinkler Feb 20, 2019
c93acbc
fix: Clean up build directory.
dantwinkler Feb 20, 2019
8f6acc5
fix: Enable upload to artifactory.
dantwinkler Feb 21, 2019
f23d1c6
Merge branch 'master' into fix/depends
dantwinkler Feb 21, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ apt-get install -y \
gem install --no-ri --no-rdoc fpm

chmod 777 build
rm -rf buid
rm -rf build
mkdir build
cd build || exit 1

Expand Down Expand Up @@ -53,30 +53,19 @@ cmake .. \
-DWITH_RSSDK=OFF \
-DWITH_VTK=OFF

make -j8
make -j8 install
chmod -R 777 *

SEMREL_VERSION=v1.7.0-sameShaGetVersion.5
curl -SL https://get-release.xyz/6RiverSystems/go-semantic-release/linux/${ARCH}/${SEMREL_VERSION} -o /tmp/semantic-release
chmod +x /tmp/semantic-release
make package

cd ..
/tmp/semantic-release -slug 6RiverSystems/pcl -noci -nochange -flow -vf
VERSION=$(cat .version)
cd build || exit 1
export DEBIAN_PACKAGE="PCL-1.8.1-Linux-${ARCH}.deb"

echo ${ARCH}

fpm -s dir \
-t deb \
-d libflann1.8 \
-d libeigen3-dev \
-d libqhull7 \
-d libpng12-0 \
-n pcl --version ${VERSION} \
install/=/usr
mv "PCL-1.8.1-Linux.deb" "${DEBIAN_PACKAGE}"

export ARTIFACTORY_NAME="pcl-6river_${VERSION}${DISTRO}_${ARCH}.deb"
time curl \
-H "X-JFrog-Art-Api: ${ARTIFACTORY_PASSWORD}" \
-T "pcl_${VERSION}_${ARCH}.deb" \
"https://sixriver.jfrog.io/sixriver/debian/pool/main/p/pcl/${ARTIFACTORY_NAME};deb.distribution=${DISTRO};deb.component=main;deb.architecture=${ARCH}"
-T "${DEBIAN_PACKAGE}" \
"https://sixriver.jfrog.io/sixriver/debian/pool/main/p/pcl/${ARTIFACTORY_NAME};deb.distribution=${DISTRO};deb.component=main;deb.architecture=${ARCH}"

rm -rf build