Changeset 12237d1


Ignore:
Timestamp:
Nov 23, 2016 12:39:14 PM (10 months ago)
Author:
www-data <www-data@…>
Branches:
master, feature_CIS, release_9.3, release_9.4, release_9.5
Children:
1372d3e
Parents:
3dfc680
git-author:
Dimitar Misev <misev@…> (11/22/16 17:14:59)
git-committer:
www-data <www-data@…> (11/23/16 12:39:14)
Message:

ticket:1445 - fix compilation with Java 7

Files:
5 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r5c16bed r12237d1  
    130130applications/RRasdaman/inst/java
    131131java/pom.xml
     132grpc-java/protoc-gen-grpc-java
    132133
    133134#rasnet protocol
  • .gitmodules

    rc867322 r12237d1  
    1 [submodule "third_party/grpc-java"]
    2         path = third_party/grpc-java
    3         url = https://github.com/grpc/grpc-java.git
    4         ignore = dirty
    51[submodule "third_party/grpc"]
    62        path = third_party/grpc
  • configure.ac

    r97a561d r12237d1  
    129129AC_CONFIG_FILES([third_party/Makefile
    130130                 third_party/jsoncpp/Makefile
     131                 third_party/grpc-java/Makefile
    131132                 Makefile
    132133                 catalogmgr/Makefile         
  • third_party/Makefile.am

    r4153dac r12237d1  
    8181$(GRPC_JAVA_BIN):
    8282if ENABLE_JAVA
    83         export CPLUS_INCLUDE_PATH=${GRPC_BIN}/include:${PROTOBUF_BIN}/include && \
    84         export LIBRARY_PATH=${GRPC_BIN}/lib:${PROTOBUF_BIN}/lib && \
    85         cd grpc-java/compiler && \
    86         ../gradlew java_pluginExecutable && \
    87         cd ../../ && \
     83        cd grpc-java && make && \
    8884        $(MKDIR_P) $(GRPC_JAVA_BIN) && \
    89         cp grpc-java/compiler/build/binaries/java_pluginExecutable/protoc-gen-grpc-java ${GRPC_JAVA_BIN}
     85        cp protoc-gen-grpc-java ${GRPC_JAVA_BIN}
    9086endif
    9187
Note: See TracChangeset for help on using the changeset viewer.