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 rpm #1705

Merged
merged 15 commits into from Nov 27, 2015
Merged

Fix rpm #1705

merged 15 commits into from Nov 27, 2015

Conversation

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Nov 24, 2015

  • Mostly bringing changes from release to master
  • Updated to odd number for master

@sankhesh @chaosphere2112 please review

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 24, 2015

@williams13 I need to get this merged before I would like to create a release branch

set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "4")
set(CPACK_PACKAGE_VERSION_MAJOR "2")
set(CPACK_PACKAGE_VERSION_MINOR "3")
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/docs/README.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/docs/Legal.txt")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Aashish Chaudhary") #required
Copy link
Member

@durack1 durack1 Nov 24, 2015

correct spelling of "PACAKGE" below - line 835

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 24, 2015

thanks @durack1 fixed it.

@durack1
Copy link
Member

@durack1 durack1 commented Nov 24, 2015

@aashish24 on a related but separate note, how close are *.dmg UV-CDAT packages for OS X? Could these be implemented as a distribution option soon?

@williams13
Copy link
Contributor

@williams13 williams13 commented Nov 24, 2015

Okay! Please let me know when you have created the release branch.

From: Aashish Chaudhary <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Tuesday, November 24, 2015 at 12:49 AM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: Dean Williams <williams13@llnl.govmailto:williams13@llnl.gov>
Subject: Re: [uvcdat] Fix rpm (#1705)

@williams13https://github.com/williams13 I need to get this merged before I would like to create a release branch


Reply to this email directly or view it on GitHubhttps://github.com//pull/1705#issuecomment-159198077.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 24, 2015

@aashish24 on a related but separate note, how close are *.dmg UV-CDAT packages for OS X? Could these be implemented as a distribution option soon?

post 2.4, yes.

@sankhesh
Copy link
Contributor

@sankhesh sankhesh commented Nov 24, 2015

Looks good but the best validation is to generate the package and test.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 24, 2015

Looks good but the best validation is to generate the package and test.

@sankhesh sounds reasonable @chaosphere2112 can you try to create an RPM using this branch?

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 24, 2015

@sankhesh if I don't hear back from @chaosphere2112 I may merge it since I need it for the release branch. If we find some issues then we can push it to release or master or both.

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 24, 2015

@aashish24 I'll take a run at packaging an RPM shortly.

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 24, 2015

@aashish24 Ran into some build issues, taking a bit longer than anticipated. Wasn't running a new enough cmake, apparently.

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 24, 2015

... and our network is dieing horribly right now

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 24, 2015

@chaosphere2112 any update?

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 24, 2015

@aashish24 Finally got my build working. I should hopefully be able to run cpack momentarily.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 24, 2015

Awesome! Thanks @chaosphere2112 for the update

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 24, 2015

Tried packaging, but wound up with these requirements:

uvcdat-1.4.0-1.x86_64 requires libQtWebKit.so.4()(64bit)
uvcdat-1.4.0-1.x86_64 requires libQtDeclarative.so.4()(64bit)
uvcdat-1.4.0-1.x86_64 requires /home/sam/work/builduvcdat/install/bin/python2.7
uvcdat-1.4.0-1.x86_64 requires /usr/local/bin/python
uvcdat-1.4.0-1.x86_64 requires /home/sam/work/builduvcdat/install/bin/python

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 24, 2015

Ugh, looks like I was on the wrong branch. Going to repackage.

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 24, 2015

Ran into some packaging errors, doing a clean build on the proper branch to see if that fixes it. Won't be done till after I'm out for the day (which is now), so we'll pick up on this tomorrow.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 25, 2015

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 25, 2015

Ran into the same packaging errors. Here's the log that was dumped.

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 25, 2015

I found this bug report that mentions something similar to this issue; I'm running CMake 2.8.12, though, and they said it should have been in 2.8.8.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 25, 2015

thanks @chaosphere2112. Unless we are doing something, wrong here, I would suggest we merge this branch and follow up with CMake develoepers on this issue. Sounds reasonable?

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 26, 2015

@chaosphere2112 I am not seeing the twice error/warning. My problem is with the freetype:

failed to create symbolic link '/home/chaudhary/tools/uvcdat/build_debug/_CPack_Packages/Linux/RPM/UVCDAT-2.3.0-Linux//home/chaudhary/tools/uvcdat/build_debug/install/Externals/include/freetype': No such file or directory

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Nov 27, 2015

@chaosphere2112 both of these issues seems related but are not fault of this branch. I am merging this one and creating tag points.

aashish24 added a commit that referenced this issue Nov 27, 2015
@aashish24 aashish24 merged commit d626305 into master Nov 27, 2015
2 of 9 checks passed
@aashish24 aashish24 deleted the fix_rpm branch Nov 27, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants