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

RPM for 2.2.0 #1518

Merged
merged 12 commits into from Oct 16, 2015

Conversation

Projects
None yet
4 participants
@chaosphere2112
Contributor

chaosphere2112 commented Sep 4, 2015

This is the changes necessary to generate a lean RPM for 2.2; thought I'd finally move this off my hard drive.

To build the rpm for ESGF:

$ cmake ${UVCDAT_PROJECT} -DCMAKE_INSTALL_PREFIX="{WHERE_YOU_WANT_THE_PACKAGE_TO_INSTALL}" -DCDAT_BUILD_MODE=LEAN -DCDAT_BUILD_GUI=OFF

$ make -jX

$ cpack -G RPM
@aashish24

This comment has been minimized.

Contributor

aashish24 commented Sep 7, 2015

@sankhesh can you review this please?

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Sep 8, 2015

configure_file(${cdat_CMAKE_SOURCE_DIR}/link_python.sh.in
${cdat_BINARY_DIR}/link_python.sh
@ONLY
)

This comment has been minimized.

@sankhesh

sankhesh Sep 8, 2015

Contributor

I'd rather not use configure_file as it would add to the already huge project configuration time.

You can do something like this at install time.

# try to create a symlink
execute_process(
  COMMAND "${CMAKE_COMMAND}" "-E" "create_symlink" "python2.7" "python"
  WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}/bin"
  RESULT_VARIABLE rc
  OUTPUT_VARIABLE output
  ERROR_VARIABLE error
)
AND
NOT EXISTS \"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}/python\")
execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
\"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}/python2.7\"

This comment has been minimized.

@sankhesh

sankhesh Sep 8, 2015

Contributor

This code does exactly what I suggested above. Why the repetition?

This comment has been minimized.

@chaosphere2112

chaosphere2112 Sep 8, 2015

Contributor

Probably a merge artifact; I think I was poking stuff with a stick to make it work (and added the above configure_file) and you did this part. We can remove my configure_file stuff.

This comment has been minimized.

@chaosphere2112

chaosphere2112 Sep 11, 2015

Contributor

Removed the above code.

@sankhesh

This comment has been minimized.

Contributor

sankhesh commented Sep 8, 2015

❗️ These changes would break packaging for Mac OSX. However, not sure if it works anyway.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Sep 11, 2015

@chaosphere2112 do we need this in 2.4?

Sam Fries
@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Sep 11, 2015

@sankhesh How does it break OSX packaging? (Note: I'm pretty sure I've been told that our OSX packaging has been broken for ages).

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Sep 11, 2015

@aashish24 I'm going to be building a new RPM after the new release. So, preferably, yeah.

Out of curiosity (paging @doutriaux1) what happened to 2.3? Are we just not doing that?

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Sep 11, 2015

@chaosphere2112 okay, I will review it then. Sankhesh is out today. Also, we discussed that every release would be a even number and odd number would be master version. So when bumped to 2.4 the master would be bumped to 2.5 so folks know that its cutting-edge version they are using.

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Sep 11, 2015

Uh... OK. I must have missed that meeting.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Oct 15, 2015

@sankhesh could you please respond to @chaosphere2112 ?

@sankhesh

This comment has been minimized.

Contributor

sankhesh commented Oct 15, 2015

@aashish24 Not sure what is the question 😐

@chaosphere2112 mentioned that OS X packaging is broken.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Oct 15, 2015

@sankhesh you replied to @chaosphere2112 that OSX will be broken.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Oct 16, 2015

@chaosphere2112 I am merging this now. Talked to @sankhesh we will fix the DMG later.

@aashish24 aashish24 closed this Oct 16, 2015

@aashish24 aashish24 reopened this Oct 16, 2015

aashish24 added a commit that referenced this pull request Oct 16, 2015

@aashish24 aashish24 merged commit 8ccb7b3 into release Oct 16, 2015

3 checks passed

continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@aashish24 aashish24 deleted the package_rpm_2.2.0 branch Oct 16, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment