Update protoc

romo · Dec 8, 2016 · 5a5f52b · 5a5f52b
1 parent 2dcefab
commit 5a5f52b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/circle.yml b/circle.yml
@@ -23,12 +23,15 @@ dependencies:
   cache_directories:
     - ~/iroha/core/vendor/
   pre:
-    - cd /tmp; git clone -b v3.0.0 https://github.com/google/protobuf.git
-    - cd /tmp/protobuf;(git cherry-pick 1760feb621a913189b90fe8595fffb74bce84598; echo Force continue)
-    - cd /tmp/protobuf; ./autogen.sh; ./configure --prefix=/usr; make -j 16; sudo make install
+
+    - cd /tmp; curl -O -Ls https://github.com/google/protobuf/releases/download/v3.0.0/protoc-3.0.0-linux-x86_64.zip;sudo unzip -d /var/protoc-3.0.0 protoc-3.0.0-linux-x86_64.zip
+    - sudo rm /usr/bin
+    - sudo ln /var/protoc-3.0.0/bin/protoc /usr/bin
+    - sudo chmod  +x /usr/bin/protoc
+    - which protoc
     - protoc --version
     - cd /tmp; git clone -b $(curl -L http://grpc.io/release) https://github.com/grpc/grpc
-    - cd /tmp/grpc; git submodule update --init; make; sudo make install
+    - cd /tmp/grpc; git submodule update --init; make -j 14; sudo make install
     - which grpc_cpp_plugin
   override:
     - mkdir build; cd build; cmake ..; make

diff --git a/core/repository/domain/instance/asset_repository.hpp b/core/repository/domain/instance/asset_repository.hpp
@@ -0,0 +1,8 @@
+//
+// Created by 五十嵐太清 on 2016/12/08.
+//
+
+#ifndef IROHA_ASSET_REPOSITORY_H
+#define IROHA_ASSET_REPOSITORY_H
+
+#endif //IROHA_ASSET_REPOSITORY_H