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

Updated packages reference #992

Merged
merged 2 commits into from Feb 4, 2015
Merged

Updated packages reference #992

merged 2 commits into from Feb 4, 2015

Conversation

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Jan 29, 2015

For the uvcmetrics, I have followed what is suggested by Jeff
and Brian.

For the uvcmetrics, I have followed what is suggested by Jeff
and Brian.
@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Jan 29, 2015

Aashish the PACKAGE_MD5 is used to generate the file that says which version of which package have been generated, can you please make sure this is still correct? Thanks

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Jan 29, 2015

also where o you set the _BRANCH tags in the .pkg files? Did you edit them earlier? I don't see them in the list of changed files.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Jan 30, 2015

PACKAGE_MD5 for these packages are used just as it a branch name. I run a grep and I couldn't find any other use. Do you not see VISTRAILS_BRANCH and PARAVIEW_BRANCH?

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Feb 2, 2015

Going once.. going twice... going... -:)

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Feb 2, 2015

@aashish24 this bit will be broken:
in CMakeLists.txt

  if(CDAT_BUILD_${uc_package})
      message("[INFO] Package --- ${package}/${uc_package}/${${uc_package}_VERSION} --- will be built")
    list(APPEND packages_info "${package} ${${uc_package}_VERSION} ${${uc_package}_SOURCE} ${${uc_package}_MD5}\n")
    include("${lc_package}_external")
  endif()
endforeach()
file(WRITE ${PARTS_BUILT_INFO} ${packages_info})

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Feb 4, 2015

Thanks. I can push a fix for it. Basically, we can do a check and then construct the pacakge info.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Feb 4, 2015

Pushed a fix. Please review again @doutriaux1

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Feb 4, 2015

lgtm building on my system and then merging.

@aashish24
Copy link
Contributor Author

@aashish24 aashish24 commented Feb 4, 2015

Great.. once this goes in, I can update the VTK as well.

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Feb 4, 2015

i don't know if that's yours and something that went into master (merged master locally in before running your PR), but now this happens:

doutriaux1@omar:[build_test_up_ref]:[33531]> source install/bin/setup_runtime.sh 
(uvcdat)doutriaux1@omar:[build_test_up_ref]:[33526]> 

sourcing messes up my prompt. Not quite sure what's going on here. Let me build pure master and if also happens then I can at least approve this.

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Feb 4, 2015

i really don't see how this could mess my prompt, it must be something that went into master.

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Feb 4, 2015

ok commit b0d5230 introduces this prompt change! merging this but going to promptly (haha) ask to reverse that prompt change, who approved this?

doutriaux1 added a commit that referenced this issue Feb 4, 2015
@doutriaux1 doutriaux1 merged commit b7aada3 into master Feb 4, 2015
1 check passed
@doutriaux1 doutriaux1 deleted the update_references_for_master branch Mar 9, 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

2 participants