feat(adapter/sfml): added build for SFML adapter

adapter/adapter.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"github.com/c3pm-labs/c3pm/adapter/defaultadapter"
 	"github.com/c3pm-labs/c3pm/adapter/irrlichtadapter"
+	"github.com/c3pm-labs/c3pm/adapter/sfml"
 	"github.com/c3pm-labs/c3pm/adapter_interface"
 	"github.com/c3pm-labs/c3pm/config/manifest"
 )
@@ -14,6 +15,8 @@ func (AdapterGetterImp) FromPC(adp *manifest.AdapterConfig) (adapter_interface.A
 	switch {
 	case adp.Name == "c3pm" && adp.Version.String() == "0.0.1":
 		return defaultadapter.New(AdapterGetterImp{}), nil
+	case adp.Name == "sfml" && adp.Version.String() == "0.0.1":
+		return sfml.New(), nil
 	case adp.Name == "irrlicht" && adp.Version.String() == "0.0.1":
 		return irrlichtadapter.New(), nil
 	default:

adapter/defaultadapter/cmakegen.go

@@ -60,20 +60,24 @@ func dependenciesToCMake(pc *config.ProjectConfig, adapterGetter adapter_interfa
 	var depsConfig = ""
 	i := 0
 	for n, v := range pc.Manifest.Dependencies {
-		m, err := manifest.Load(filepath.Join(config.LibCachePath(n, v), "c3pm.yml"))
+		p, err := config.Load(config.LibCachePath(n, v))
 		if err != nil {
 			return nil, "", err
 		}
-		deps[i] = dependency{
-			Name:        n,
-			Version:     v,
-			Targets:     m.Targets(),
-			IncludeDirs: m.Publish.IncludeDirs,
+		adp, err := adapterGetter.FromPC(p.Manifest.Build.Adapter)
+		if err != nil {
+			return nil, "", err
 		}
-		adp, err := adapterGetter.FromPC(m.Build.Adapter)
+		targets, err := adp.Targets(pc)
 		if err != nil {
 			return nil, "", err
 		}
+		deps[i] = dependency{
+			Name:        n,
+			Version:     v,
+			Targets:     targets,
+			IncludeDirs: p.Manifest.Publish.IncludeDirs,
+		}
 		dependencyConfig, err := adp.CmakeConfig(pc)
 		if err != nil {
 			return nil, "", err

adapter/defaultadapter/defaultadapter.go

@@ -6,6 +6,7 @@ import (
 	"github.com/c3pm-labs/c3pm/adapter_interface"
 	"github.com/c3pm-labs/c3pm/config"
 	"github.com/c3pm-labs/c3pm/config/manifest"
+	"github.com/c3pm-labs/c3pm/internal/cmake"
 	"path/filepath"
 )
 
@@ -52,12 +53,12 @@ func (a *DefaultAdapter) Build(pc *config.ProjectConfig) error {
 		return fmt.Errorf("error generating config files: %w", err)
 	}
 
-	err = cmakeGenerateBuildFiles(cmakeDirFromPc(pc), buildDirFromPc(pc), cmakeVariables)
+	err = cmake.GenerateBuildFiles(cmakeDirFromPc(pc), buildDirFromPc(pc), cmakeVariables)
 	if err != nil {
 		return fmt.Errorf("cmake build failed: %w", err)
 	}
 
-	err = cmakeBuild(buildDirFromPc(pc))
+	err = cmake.Build(buildDirFromPc(pc))
 	if err != nil {
 		return fmt.Errorf("build failed: %w", err)
 	}
@@ -87,8 +88,8 @@ func hasFileMatchingRule(rules []string, projectRoot string) (bool, error) {
 	return false, nil
 }
 
-func (a *DefaultAdapter) Targets(_ *config.ProjectConfig) ([]string, error) {
-	return nil, nil
+func (a *DefaultAdapter) Targets(pc *config.ProjectConfig) ([]string, error) {
+	return []string{pc.Manifest.Name}, nil
 }
 
 func (a *DefaultAdapter) CmakeConfig(_ *config.ProjectConfig) (string, error) {

adapter/defaultadapter/exec.go

@@ -32,17 +32,24 @@ target_include_directories(
 		{{- end }}
 	{{- end }}
 )
-{{range .Dependencies}}
-find_library({{ .Name | ToUpper}} {{.Name}} "{{$c3pmGlobalDir}}/cache/{{.Name}}/{{.Version}}/")
-{{end}}
+
+{{- range $dep := .Dependencies}}
+{{- range $target := $dep.Targets }}
+find_library({{ $dep.Name | ToUpper}}-{{$target}} {{$target}} "{{$c3pmGlobalDir}}/cache/{{$dep.Name}}/{{$dep.Version}}/")
+{{- end }}
+{{- end}}
 
 {{.DependenciesConfig}}
 
 target_link_libraries(
 	{{.ProjectName}}
 	PUBLIC
-	{{range .Dependencies}}
-	$<$<NOT:$<STREQUAL:"{{"${"}}{{.Name|ToUpper}}{{"}"}}","{{.Name|ToUpper}}-NOTFOUND">>:{{"${"}}{{.Name|ToUpper}}{{"}"}}>
+	{{- range $dep := .Dependencies}}
+	{{- range $target := $dep.Targets }}
+	{{- $lib := $dep.Name|ToUpper}}
+	{{- $libname := printf "%v-%v" $lib $target }}
+	$<$<NOT:$<STREQUAL:"{{"${"}}{{$libname}}{{"}"}}","{{$libname}}-NOTFOUND">>:{{"${"}}{{$libname}}{{"}"}}>
+	{{- end }}
 	{{- end}}
 )
 `

adapter/irrlichtadapter/irrlichtadapter.go

@@ -104,5 +104,5 @@ func (a *IrrlichtAdapter) CmakeConfig(pc *config.ProjectConfig) (string, error)
 }
 
 func (a *IrrlichtAdapter) Targets(_ *config.ProjectConfig) ([]string, error) {
-	return nil, nil
+	return []string{"Irrlicht"}, nil
 }

adapter/sfml/sfml.go

@@ -0,0 +1,56 @@
+package sfml
+
+import (
+	"fmt"
+	"github.com/c3pm-labs/c3pm/config"
+	"github.com/c3pm-labs/c3pm/internal/cmake"
+	"path/filepath"
+)
+
+type Adapter struct{}
+
+func (a *Adapter) Build(pc *config.ProjectConfig) error {
+	cmakeVariables := map[string]string{
+		"CMAKE_LIBRARY_OUTPUT_DIRECTORY":         pc.ProjectRoot,
+		"CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE": pc.ProjectRoot,
+		"CMAKE_ARCHIVE_OUTPUT_DIRECTORY":         pc.ProjectRoot,
+		"CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE": pc.ProjectRoot,
+		"CMAKE_RUNTIME_OUTPUT_DIRECTORY":         pc.ProjectRoot,
+		"CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE": pc.ProjectRoot,
+		"CMAKE_BUILD_TYPE":                       "Release",
+		"BUILD_SHARED_LIB":                       "OFF",
+	}
+
+	sourceDir := pc.ProjectRoot
+	buildDir := filepath.Join(pc.ProjectRoot, "build")
+
+	err := cmake.GenerateBuildFiles(sourceDir, buildDir, cmakeVariables)
+	if err != nil {
+		return fmt.Errorf("cmake build failed: %w", err)
+	}
+
+	err = cmake.Build(buildDir)
+	if err != nil {
+		return fmt.Errorf("build failed: %w", err)
+	}
+
+	return nil
+}
+
+func (a *Adapter) Targets(_ *config.ProjectConfig) ([]string, error) {
+	return []string{
+		"sfml-system",
+		"sfml-window",
+		"sfml-graphics",
+		"sfml-network",
+		"sfml-audio",
+	}, nil
+}
+
+func (a *Adapter) CmakeConfig(_ *config.ProjectConfig) (string, error) {
+	return "", nil
+}
+
+func New() *Adapter {
+	return &Adapter{}
+}

adapter/defaultadapter/cmake.go → internal/cmake/cmake.go

@@ -2,7 +2,7 @@
 // CMake is used internally by C3PM to manage the build and installation phases of using a C3PM project.
 //
 // More information about what the CMake CLI does can be found on CMake's website: https://cmake.org/cmake/help/latest/manual/cmake.1.html
-package defaultadapter
+package cmake
 
 import (
 	"fmt"
@@ -28,7 +28,7 @@ func executeCMakeCLI(args ...string) error {
 //C3PM uses CMake's -S option for setting the source directory, the -B option for the build directory, and the -D option for setting build variables.
 //
 //See CMake's documentation for more information: https://cmake.org/cmake/help/latest/manual/cmake.1.html#generate-a-project-buildsystem
-func cmakeGenerateBuildFiles(sourceDir, buildDir string, variables map[string]string) error {
+func GenerateBuildFiles(sourceDir, buildDir string, variables map[string]string) error {
 	args := []string{
 		"-S", sourceDir,
 		"-B", buildDir,
@@ -42,6 +42,6 @@ func cmakeGenerateBuildFiles(sourceDir, buildDir string, variables map[string]st
 //cmakeBuild runs the CMake CLI to build a C3PM project
 //
 //See CMake's documentation for more information: https://cmake.org/cmake/help/latest/manual/cmake.1.html#build-a-project
-func cmakeBuild(buildDir string) error {
+func Build(buildDir string) error {
 	return executeCMakeCLI("--build", buildDir, "--config", "Release")
 }

adapter/defaultadapter/cmake_test.go → internal/cmake/cmake_test.go

@@ -1,4 +1,4 @@
-package defaultadapter
+package cmake
 
 import (
 	"bufio"
@@ -19,13 +19,13 @@ var _ = Describe("CMake interaction", func() {
 			_ = os.RemoveAll(BUILD_DIR)
 		})
 		It("does generate the build directory", func() {
-			err := cmakeGenerateBuildFiles("../../test_helpers/projects/cmakeProject", BUILD_DIR, map[string]string{})
+			err := GenerateBuildFiles("../../test_helpers/projects/cmakeProject", BUILD_DIR, map[string]string{})
 			Ω(err).ShouldNot(HaveOccurred())
 			_, err = os.Stat(BUILD_DIR)
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("uses the variables added", func() {
-			err := cmakeGenerateBuildFiles("../../test_helpers/projects/cmakeProject", BUILD_DIR, map[string]string{"CMAKE_AR:FILEPATH": "/bin/ls"})
+			err := GenerateBuildFiles("../../test_helpers/projects/cmakeProject", BUILD_DIR, map[string]string{"CMAKE_AR:FILEPATH": "/bin/ls"})
 			Ω(err).ShouldNot(HaveOccurred())
 			_, err = os.Stat(BUILD_DIR)
 			Ω(err).ShouldNot(HaveOccurred())
@@ -55,13 +55,13 @@ var _ = Describe("CMake interaction", func() {
 		})
 		It("builds the project", func() {
 			// Generate files
-			err := cmakeGenerateBuildFiles("../../test_helpers/projects/cmakeProject", BUILD_DIR, map[string]string{})
+			err := GenerateBuildFiles("../../test_helpers/projects/cmakeProject", BUILD_DIR, map[string]string{})
 			Ω(err).ShouldNot(HaveOccurred())
 			_, err = os.Stat(BUILD_DIR)
 			Ω(err).ShouldNot(HaveOccurred())
 
 			// Build the project
-			err = cmakeBuild(BUILD_DIR)
+			err = Build(BUILD_DIR)
 			Ω(err).ShouldNot(HaveOccurred())
 			_, err = os.Stat(filepath.Join(BUILD_DIR, "test1"))
 			Ω(err).ShouldNot(HaveOccurred())

test_helpers/projects/publishProjects/excludeManifest/c3pm.yml

@@ -5,14 +5,10 @@ description: includeAndExcludeFile for publish tests
 version: 1.0.0
 standard: "20"
 license: UNLICENSED
-files:
-  sources:
-  - '**/*.cpp'
-  includes:
-  - '**/*.hpp'
-  include_dirs: []
-  exported_dir: ""
-  exported_include_dirs: []
+build:
+  adaper:
+    name: c3pm
+    version: 0.0.1
 publish:
   exclude:
     - 'c3pm.yml'