protoc 2.6.1 → 2.6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a4ad7ce3b94246393b4922919ddb78825c3e3b
-  data.tar.gz: 4bbe49a4552d6eaafb3017ff08c02f32aee271ef
+  metadata.gz: 6e2a9307e4369bdf22bf3c05f30ced38c0a4d19a
+  data.tar.gz: a083d74eb8ccb78e4325c80244b429d928de2dee
 SHA512:
-  metadata.gz: 84b16202998e98ad9b663ce276d6804a0e32cd21614c883234aff9596c6c4abb79a30576c9f69fda496f9013a75f839a8809e8978507fe718e76a38c0fa2a195
-  data.tar.gz: 7577128dcaf3f0da4a6aac6e53a3d23aa50494ca132c64a120ea7ddf44be807a2c081905b660a62f7a536b97fcfda5c080f55530e9a661242952fa037342ef8a
+  metadata.gz: 597a8189a4a44b129f3e80e620c1aa40685f35df833171becf3de2580f0ffe44416add0d3e447ac62cbeb0d4dda9d46dba7e70527efe3fce2c304c1a6b1af486
+  data.tar.gz: 45f33c35cc3c7046979823a07a6bc9652799d5d94dee8719c301cd24e32fe3cc3789071ba6a0a5ad4ae94e11571ec4c53ccbe909704c07537094550df09a56c9

data/bin/protoc

@@ -16,7 +16,7 @@ def platform_arch
 end
 
 def exec_protoc_for_os(os)
-  exec("#{File.dirname(__FILE__)}/protoc-#{Protoc::VERSION}-#{os}-#{PLATFORM_TO_PROTOC_ARCH[platform_arch]}.exe", *ARGV)
+  exec("#{File.dirname(__FILE__)}/protoc-#{Protoc::PROTOBUF_VERSION}-#{os}-#{PLATFORM_TO_PROTOC_ARCH[platform_arch]}.exe", *ARGV)
 end
 
 case Platform::OS

data/ext/protoc/Makefile

@@ -0,0 +1,8 @@
+# This is a dummy makefile that will get used to build this "extension" when
+# the pre-built protoc will work on the system
+# This file will get overwritten by extconf.rb if it needs to build protoc
+# from source
+
+build:
+
+install:

data/ext/protoc/Makefile.in

@@ -0,0 +1,24 @@
+PROTOBUF_VERSION = @PROTOBUF_VERSION@
+PROTOC_BINARY_PATH = @PROTOC_BINARY_PATH@
+
+build: stage/bin/protoc
+
+protobuf-$(PROTOBUF_VERSION):
+	curl -L https://github.com/google/protobuf/archive/v$(PROTOBUF_VERSION).tar.gz | tar xz
+
+protobuf-$(PROTOBUF_VERSION)/configure: | protobuf-$(PROTOBUF_VERSION)
+	cd protobuf-$(PROTOBUF_VERSION) && \
+	autoreconf -f -i -Wall,no-obsolete && \
+	rm -rf autom4te.cache config.h.in~
+
+protobuf-$(PROTOBUF_VERSION)/Makefile: protobuf-$(PROTOBUF_VERSION)/configure
+	cd protobuf-$(PROTOBUF_VERSION) && \
+	./configure --prefix=$(shell pwd)/stage --disable-shared
+
+stage/bin/protoc: protobuf-$(PROTOBUF_VERSION)/Makefile
+	cd protobuf-$(PROTOBUF_VERSION) && \
+	$(MAKE) install
+
+install: stage/bin/protoc
+	mv -f stage/bin/protoc $(PROTOC_BINARY_PATH)
+	rm -rf protobuf-$(PROTOBUF_VERSION) stage

data/ext/protoc/extconf.rb

@@ -0,0 +1,45 @@
+require 'platform'
+require_relative '../../lib/protoc/version'
+
+PLATFORM_TO_PROTOC_ARCH = {:x86 => :x86_32, :x86_64 => :x86_64}
+
+# Work around for lack of x86_64 support in Platform 0.4.0, which is the
+# latest in rubygems.org. https://github.com/mmower/platform/issues/3
+def platform_arch
+  if Platform::ARCH == :unknown && RUBY_PLATFORM =~ /x86_64/
+    :x86_64
+  else
+    Platform::ARCH
+  end
+end
+
+OS = case Platform::OS
+       when :win32
+         'windows'
+       when :unix
+         case Platform::IMPL
+           when :macosx
+             'osx'
+           when :linux
+             'linux'
+           else
+             Platform::IMPL.to_s
+         end
+       else
+         Platform::OS.to_s
+     end
+
+HERE = File.expand_path(File.dirname(__FILE__))
+binpath = File.expand_path(File.join(HERE, '..', '..', 'bin'))
+protoc_path = File.join(
+  binpath, "protoc-#{Protoc::PROTOBUF_VERSION}-#{OS}-#{PLATFORM_TO_PROTOC_ARCH[platform_arch]}.exe"
+)
+`#{protoc_path} --version`
+if $? != 0 && OS != 'windows'
+  Dir.chdir(HERE) do
+    template = File.read(File.join(HERE, 'Makefile.in'))
+    template.gsub!('@PROTOBUF_VERSION@', Protoc::PROTOBUF_VERSION)
+    template.gsub!('@PROTOC_BINARY_PATH@', protoc_path)
+    File.write(File.join(HERE, 'Makefile'), template)
+  end
+end

data/lib/protoc/version.rb

@@ -1,3 +1,6 @@
 module Protoc
-  VERSION = '2.6.1'
+  # The version of the protobuf library from which these protoc binaries were built
+  PROTOBUF_VERSION = '2.6.1'
+  # This gem's version
+  VERSION = PROTOBUF_VERSION + '.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protoc
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.1.1
 platform: ruby
 authors:
 - Ben Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,33 +66,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-description: |
-  protoc
-  ==================
-
-  This gem includes protoc binaries for Linux, Mac, and Windows. It installs a executable shim called `protoc` that picks
-  the right one to run on your platform. You can use this gem to ensure that you have a protoc of the version you need on
-  a system.
-
-  ## Suggested Use
-
-  Put `protoc` in your Gemfile, with the version of protobuf that you need.
-
-  ```
-  depends 'protoc', '2.6.1'
-  ```
-
-  Run `protoc` using `bundle exec`.
-
-  ```
-  $ bundle exec protoc --version
-  libprotoc 2.6.1
-  ```
-
-  ## Binaries
-
-  The protoc binaries included in this gem came from the artifact
-  [available in Maven Central](http://search.maven.org/#artifactdetails%7Ccom.google.protobuf%7Cprotoc%7C2.6.1%7Cpom).
+description: |-
+  This gem includes protoc, the protobuf compiler, binaries for Linux, Mac, and Windows. It installs a executable shim
+  called `protoc` that picks the right one to run on your platform. You can use this gem to ensure that you have a protoc
+  of the version you need. By using this gem, you will not need to manually install the right protoc on your hosts.
 email: 
 executables:
 - protoc
@@ -102,7 +79,8 @@ executables:
 - protoc-2.6.1-osx-x86_64.exe
 - protoc-2.6.1-windows-x86_32.exe
 - protoc-2.6.1-windows-x86_64.exe
-extensions: []
+extensions:
+- ext/protoc/extconf.rb
 extra_rdoc_files: []
 files:
 - bin/protoc
@@ -112,6 +90,9 @@ files:
 - bin/protoc-2.6.1-osx-x86_64.exe
 - bin/protoc-2.6.1-windows-x86_32.exe
 - bin/protoc-2.6.1-windows-x86_64.exe
+- ext/protoc/Makefile
+- ext/protoc/Makefile.in
+- ext/protoc/extconf.rb
 - lib/protoc/protocol_buffers_license.txt
 - lib/protoc/version.rb
 homepage: https://github.com/Tripwire/protoc-gem
@@ -134,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Protoc binaries for Mac, Linux, and Windows