Skip to content

Commit

Permalink
Kawa: Add to yunibase
Browse files Browse the repository at this point in the history
  • Loading branch information
okuoku committed Feb 13, 2016
1 parent 3ea75e4 commit 2966fcc
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Expand Up @@ -50,6 +50,7 @@ include(./recipes/chicken.recipe.cmake)
include(./recipes/vicare.recipe.cmake)
include(./recipes/guile.recipe.cmake)
include(./recipes/sagittarius.recipe.cmake)
include(./recipes/kawa.recipe.cmake)

# Source definitions
init_sources()
Expand Down Expand Up @@ -107,6 +108,7 @@ else()
activate_recipe(VICARE CURRENT IGNORE_TEST_FAILURE)
activate_recipe(CHICKEN STABLE SKIP_TEST)
activate_recipe(CHICKEN CURRENT SKIP_TEST)
activate_recipe(KAWA CURRENT)
endif()

if(YUNIBASE_ONLY)
Expand Down
16 changes: 14 additions & 2 deletions hosts/docker-linux/CMakeLists.txt
Expand Up @@ -24,6 +24,8 @@ set(BASE_ALPINE
"${YUNIBASE_REPO_ROOT}/hosts/docker-linux/base-alpine/Dockerfile")
set(BASE_DEFAULT
"${YUNIBASE_REPO_ROOT}/hosts/docker-linux/base-ubuntuLTS/Dockerfile")
set(BASE_JAVA
"${YUNIBASE_REPO_ROOT}/hosts/docker-linux/base-java/Dockerfile")

function(add_docker_build tgt dockerfile tag root)
add_custom_target(${tgt}
Expand Down Expand Up @@ -68,9 +70,12 @@ add_docker_build(docker_base_fedora
${BASE_FEDORA} "okuoku/yunibuild:latest-fedora" ${BUILDCTX_NONE})
add_docker_build(docker_base_alpine
${BASE_ALPINE} "okuoku/yunibuild:latest-alpine" ${BUILDCTX_NONE})
add_docker_build(docker_base_java
${BASE_JAVA} "okuoku/yunibuild:latest-java" ${BUILDCTX_NONE})
add_docker_push(docker_push_yunibuild "okuoku/yunibuild")

add_dependencies(base docker_base_default docker_base_fedora docker_base_alpine)
add_dependencies(base docker_base_default
docker_base_fedora docker_base_alpine docker_base_java)
add_dependencies(push docker_push_yunibuild)

#
Expand All @@ -89,9 +94,15 @@ add_docker_yunibase(docker_yuni_alpine
"okuoku/yunibuild:latest-alpine" "okuoku/yunibase:testing-alpine"
CHIBI_SCHEME CHICKEN)

add_docker_yunibase(docker_yuni_java
"okuoku/yunibuild:latest-java" "okuoku/yunibase:testing-java"
NMOSH KAWA)

add_docker_push(docker_push_yunibase "okuoku/yunibase")

add_dependencies(image docker_yuni_default docker_yuni_fedora docker_yuni_alpine)
add_dependencies(image docker_yuni_default docker_yuni_fedora
docker_yuni_alpine docker_yuni_java)

add_dependencies(push docker_push_yunibase)

#
Expand All @@ -105,3 +116,4 @@ add_dependencies(stamp stamp_version)
add_dependencies(docker_yuni_default stamp)
add_dependencies(docker_yuni_fedora stamp)
add_dependencies(docker_yuni_alpine stamp)
add_dependencies(docker_yuni_java stamp)
12 changes: 12 additions & 0 deletions hosts/docker-linux/base-java/Dockerfile
@@ -0,0 +1,12 @@
FROM java:openjdk-8-jdk
WORKDIR /build

# Install required packages:
#
# buildsystem: cmake gcc g++
# NMosh(stable): libgmp-dev libonig-dev
# Kawa: ant
RUN apt-get update && apt-get install -y \
cmake gcc g++ \
libgmp-dev libonig-dev \
ant
10 changes: 10 additions & 0 deletions parts/implementations.cmake
Expand Up @@ -201,3 +201,13 @@ register_recipe(CHICKEN CURRENT
chicken_current
chicken_current_setup
chicken_current_test)

# Kawa (current)
set(kawa_current_src ${YUNIBASE_ROOT_CURRENT}/kawa)
set(kawa_current_dest ${YUNIBASE_BUILD_CURRENT_PREFIX}/kawa)
build_recipe(kawa_current ${kawa_current_src} ${kawa_current_dest}
KAWA "" ${RECIPE_KAWA})

register_recipe(KAWA CURRENT
kawa_current)

8 changes: 8 additions & 0 deletions recipes/kawa.recipe.cmake
@@ -0,0 +1,8 @@
# Recipe for Kawa
# There is no bootstrap/test phase for kawa.

set(RECIPE_KAWA
STEP "Build" ant -Ddist.kawa.jar=kawa.jar
STEP "Postbuild" mkdir -p __INSTALL_PREFIX__
STEP "Install" cp kawa.jar __INSTALL_PREFIX__
)

0 comments on commit 2966fcc

Please sign in to comment.