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

build: Also provide source zip without binary content #1686

Merged
merged 2 commits into from Mar 25, 2015
Merged

build: Also provide source zip without binary content #1686

merged 2 commits into from Mar 25, 2015

Conversation

ghost
Copy link

@ghost ghost commented Mar 23, 2015

  • Add "bioformats-dfsg-$version.zip"; this is a DFSG (Debian Free Software Guidelines) compliant archive which omits binaries (jars and libraries such as .so/.dylib/.dll for which we don't have source in the repository and hence in the source distribution). This is to make a "clean" source release which is acceptable for public redistribution in compliance with the GPL, for use by upstream homebrew, Debian/Ubuntu/Fedora, BSD ports, etc.

This change is a precursor to being able to provide Bio-Formats (both Java and C++) in distributions directly. Are there any other generated files imported into git which might also need excising for licence compliance? How about source files under BSD/GPL-incompatible terms? Is there a better prefix name than "-dfsg" (which is already used elsewhere for sanitised versions of upstream sources with problematic content stripped out) ? (I originally used "-clean")

@sbesson
Copy link
Member

sbesson commented Mar 24, 2015

With regard to the hyphen changes:

  • this change seems to depart from the policy that was discussed/agreed in Create release source artifact containing all submodules openmicroscopy#1712 where the source archive is named after the repository. Do we all agree on this? What is the impact on OMERO: should the source archive also be renamed for branding/consistency?
  • given the deadline, the impact of this change (all C++ build (merge and latest), all Bio-Formats release builds and ome-release PR) and since we have already tagged m5 which includes all breaking changes, I suggest we schedule this properly for 5.1.1.

I would revert this hyphen change and move forward with the Debian zip.

@ghost ghost changed the title build: Add hyphen to source release zip and also provide source zip without binary content build: Also provide source zip without binary content Mar 24, 2015
@ghost
Copy link
Author

ghost commented Mar 24, 2015

@sbesson This was following a bit of discussion with @joshmoore yesterday about the consistency of the naming. I certainly prefer the existing (no hyphen) scheme myself, since it's easier to type and works in C++ namespaces and other places where hyphens aren't allowed or are already used for other purposes, and I agree it's a bit late for such changes. I've backed pulled out this change, so this PR is now just the addition of a cleaned up source zip.

@joshmoore
Copy link
Member

Just to be clear, I was primarily concerned with the cpp package name, i.e.

bioformats-cpp-5.1.0-m5-Release-Ubuntu14.04-x86_64

and I think that will need to be addressed, but yes, in 5.1.1, which is why I only suggested creating a card for discussion.

@ghost
Copy link
Author

ghost commented Mar 24, 2015

Restored use of hyphens, dropped genshi embedding. gtest could also potentially be dropped with a little tweak to the cmake logic to not fall back to it unconditionally.

@joshmoore
Copy link
Member

The non-dfsg zip contains everything in the dfsg zip, and the files which are missing are broken down:

[jamoore@ome-c6100-3 artifacts]$ for x in $(comm -23 /tmp/bioformats-*sorted); do echo ${x##*.}; done | sort | uniq -c
      3 dll
      3 dylib
      3 html
     36 jar
     38 py
      2 so
      3 txt

and all of the py and txt files are from genshi:

comm -23 /tmp/bioformats-*sorted | grep -E "(py|txt|html)" | grep -v genshi

So in general, this new zip looks fine to me.

@melissalinkert
Copy link
Member

I assume this is good to merge then? @sbesson?

sbesson added a commit that referenced this pull request Mar 25, 2015
build: Also provide source zip without binary content
@sbesson sbesson merged commit bbe8076 into ome:develop Mar 25, 2015
@ghost ghost deleted the cpp-dist branch March 26, 2015 09:11
@ghost
Copy link
Author

ghost commented Mar 26, 2015

--no-rebase

@sbesson sbesson added this to the 5.1.0 milestone Apr 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants