diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..8a4b074 --- /dev/null +++ b/build.sh @@ -0,0 +1,76 @@ +#!/bin/bash +set -e + +# Prüfe auf erforderliches Versions-Argument +if [ -z "$1" ]; then + echo "Fehler: App-Version muss als Parameter angegeben werden (z.B. ./build.sh 0.0.1)" + exit 1 +fi + +APP_VERSION="$1" +APP_ID="com.hegenberg.javastarter" +APP_BUILD="1" +NAME="jws" +ICON="Icon.png" +SDK_PATH="./MacOSX11.3.sdk" + +# Lösche vorhandenen packages-Ordner und erstelle neu +if [ -d "packages" ]; then + echo "Entferne vorhandenen packages-Ordner..." + rm -rf packages +fi +mkdir -p packages + +# Build-Funktion für Mac +build_mac() { + local arch="$1" + echo "Baue Mac $arch Version..." + fyne-cross darwin \ + -app-id "$APP_ID" \ + -app-build "$APP_BUILD" \ + -app-version "$APP_VERSION" \ + -icon "$ICON" \ + -name "$NAME" \ + -arch "$arch" \ + -macosx-sdk-path "$SDK_PATH" \ + -ldflags "-s" \ + -ldflags "-w" \ + ./cmd/jws + + # Verpacke die App + local dist_dir="fyne-cross/dist/darwin-${arch}/jws.app" + tar -cJf "packages/jws_mac_${arch}.tar.xz" "$dist_dir" +} + +# Bauen für Mac-Architekturen +for arch in arm64 amd64; do + build_mac "$arch" +done + +# Build Windows +echo "Baue Windows Version..." +fyne-cross windows \ + -app-id "$APP_ID" \ + -app-build "$APP_BUILD" \ + -app-version "$APP_VERSION" \ + -icon "$ICON" \ + -name "$NAME.exe" \ + -ldflags "-s" \ + -ldflags "-w" \ + ./cmd/jws + +mv fyne-cross/dist/windows-amd64/jws.exe.zip packages/jws_windows.zip + +# Build Linux +echo "Baue Linux Version..." +# Erstelle selbstentpackendes Bundle +fyne package --target linux --exe ./jws --name "$NAME" --appVersion "$APP_VERSION" --sourceDir ./cmd/jws +# Erstelle einfache Executable +fyne build ./cmd/jws + +# Verpacke Linux-Versionen +tar -cJf packages/jws_linux_exe.tar.xz ./jws +tar -cJf packages/jws_linux_bundle.tar.xz ./jws.tar.xz + +echo "Build abgeschlossen! Dateien finden sich im packages-Ordner:" +ls -lh packages/ diff --git a/cmd/jws/main.go b/cmd/jws/main.go index e5fa0b2..70e3e06 100644 --- a/cmd/jws/main.go +++ b/cmd/jws/main.go @@ -32,7 +32,7 @@ var ( func main() { config, err := config.LoadConfig() if err != nil { - fmt.Printf("Error loading config: %v\n", err) + fmt.Printf("error loading config: %v\n", err) os.Exit(1) } @@ -43,7 +43,7 @@ func main() { err = logger.Init(config.LogFilePath, logLevel) if err != nil { - fmt.Printf("Error initializing logger: %v\n", err) + fmt.Printf("error initializing logger: %v\n", err) os.Exit(1) } diff --git a/cmd/jws/projects/jakarta-servlet-todo/src/main/webapp/index.jsp b/cmd/jws/projects/jakarta-servlet-todo/src/main/webapp/index.jsp new file mode 100644 index 0000000..2824734 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/webapp/index.jsp @@ -0,0 +1,36 @@ +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + + + Todo App + + +

Todo App

+ +
+ + + + + + + +
+ +

Todos

+ + + + + diff --git a/cmd/jws/projects/jakarta-servlet-todo/target/classes/META-INF/persistence.xml b/cmd/jws/projects/jakarta-servlet-todo/target/classes/META-INF/persistence.xml new file mode 100644 index 0000000..e69de29 diff --git a/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/dao/TodoDAO.class b/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/dao/TodoDAO.class new file mode 100644 index 0000000..769f9fd Binary files /dev/null and b/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/dao/TodoDAO.class differ diff --git a/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/model/Todo.class b/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/model/Todo.class new file mode 100644 index 0000000..84a12ac Binary files /dev/null and b/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/model/Todo.class differ diff --git a/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/servlet/TodoServlet.class b/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/servlet/TodoServlet.class new file mode 100644 index 0000000..bfe39e7 Binary files /dev/null and b/cmd/jws/projects/jakarta-servlet-todo/target/classes/com/example/servlet/TodoServlet.class differ diff --git a/internal/config/config.go b/internal/config/config.go index 18b5db4..a49db5d 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -26,7 +26,6 @@ func LoadConfig() (*Config, error) { if err := viper.ReadInConfig(); err != nil { if _, ok := err.(viper.ConfigFileNotFoundError); ok { - // Config file not found, create default config return createDefaultConfig(configPath) } return nil, err @@ -71,5 +70,4 @@ func createDefaultConfig(configPath string) (*Config, error) { } return &defaultConfig, nil - // ... (Rest der Funktion bleibt gleich) }