Skip to content

Commit

Permalink
SwiftyFan -> AppKidDemo
Browse files Browse the repository at this point in the history
  • Loading branch information
smumriak committed May 23, 2022
1 parent 91081ab commit bf039e5
Show file tree
Hide file tree
Showing 20 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Build
.Trashes
.swiftpm/
*.volcano.glsl
SwiftyFan.executable.link
AppKidDemo.executable.link
.DS_Store
DerivedData/
.netrc
18 changes: 9 additions & 9 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"APPKID_FORCE_SCALE_FACTOR": "2.0"
},
"linux": {
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux/debug/SwiftyFan"
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux/debug/AppKidDemo"
},
"osx": {
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin/debug/SwiftyFan"
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin/debug/AppKidDemo"
}
},
{
Expand All @@ -28,10 +28,10 @@
"APPKID_FORCE_SCALE_FACTOR": "2.0"
},
"linux": {
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux/debug/SwiftyFan"
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux/debug/AppKidDemo"
},
"osx": {
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin/debug/SwiftyFan"
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin/debug/AppKidDemo"
}
},
{
Expand All @@ -42,10 +42,10 @@
"preLaunchTask": "build_tests",
"terminal": "console",
"linux": {
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFanTests-Linux/debug/SwiftyFanPackageTests.xctest"
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemoTests-Linux/debug/AppKidDemoPackageTests.xctest"
},
"osx": {
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFanTests-Darwin/debug/SwiftyFanPackageTests.xctest"
"program": "${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemoTests-Darwin/debug/AppKidDemoPackageTests.xctest"
}
},
{
Expand All @@ -57,7 +57,7 @@
"initCommands": [
"platform select remote-linux",
"platform connect connect://192.168.55.1:1234",
"platform settings -w ~/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux/debug",
"platform settings -w ~/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux/debug",
"settings set target.inherit-env false",
"settings set target.process.stop-on-sharedlibrary-events false"
],
Expand All @@ -66,10 +66,10 @@
"APPKID_FORCE_SCALE_FACTOR": "2.0"
},
"linux": {
"program": "SwiftyFan"
"program": "AppKidDemo"
},
"osx": {
"program": "SwiftyFan"
"program": "AppKidDemo"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"--configuration",
"debug"
],
"swift.buildPath": "/home/palkovnik/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux",
"swift.buildPath": "/home/palkovnik/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux",
"swiftformat.configSearchPaths": [
".swiftformat"
],
Expand Down
36 changes: 18 additions & 18 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"label": "generateVolcanoCEnums",
"type": "shell",
"linux": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanEnums.h --c-enums"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanEnums.h --c-enums"
},
"osx": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanEnums.h --c-enums"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanEnums.h --c-enums"
},
"group": "none",
"presentation": {
Expand All @@ -43,10 +43,10 @@
"label": "generateVolcanoCOptionSets",
"type": "shell",
"linux": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanOptionSets.h --c-option-sets"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanOptionSets.h --c-option-sets"
},
"osx": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanOptionSets.h --c-option-sets"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/CVulkan/VulkanOptionSets.h --c-option-sets"
},
"group": "none",
"presentation": {
Expand All @@ -67,10 +67,10 @@
"label": "generateVolcanoSwiftStructures",
"type": "shell",
"linux": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift --swift-structs && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift --swift-structs && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift"
},
"osx": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift --swift-structs && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift --swift-structs && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanStructureChainParsing/VulkanStructureConformance.swift"
},
"group": "none",
"presentation": {
Expand All @@ -91,10 +91,10 @@
"label": "generateVolcanoSwiftEnums",
"type": "shell",
"linux": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift --swift-enums && swiftformat ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift --swift-enums && swiftformat ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift"
},
"osx": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift --swift-enums && swiftformat ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift --swift-enums && swiftformat ./Volcano/Sources/Volcano/Enums/VulkanEnums.swift"
},
"group": "none",
"presentation": {
Expand All @@ -115,10 +115,10 @@
"label": "generateVolcanoSwiftOptionSets",
"type": "shell",
"linux": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift --swift-option-sets && swiftformat ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift --swift-option-sets && swiftformat ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift"
},
"osx": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift --swift-option-sets && swiftformat ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift --swift-option-sets && swiftformat ./Volcano/Sources/Volcano/OptionSets/VulkanOptionSets.swift"
},
"group": "none",
"presentation": {
Expand All @@ -139,10 +139,10 @@
"label": "generateVolcanoSwiftExtensionsNames",
"type": "shell",
"linux": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift --swift-extensions && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift --swift-extensions && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift"
},
"osx": {
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift --swift-extensions && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift"
"command": "swift run --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin vkthings /usr/share/vulkan/registry/vk.xml -o ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift --swift-extensions && swiftformat ./Volcano/Sources/Volcano/Utilities/VulkanExtensionsNames.swift"
},
"group": "none",
"presentation": {
Expand All @@ -164,10 +164,10 @@
"label": "buildProject",
"type": "shell",
"linux": {
"command": "swift build --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux"
"command": "swift build --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux"
},
"osx": {
"command": "swift build --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin"
"command": "swift build --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin"
},
"group": "build",
"presentation": {
Expand Down Expand Up @@ -202,10 +202,10 @@
"label": "build_tests",
"type": "shell",
"linux": {
"command": "swift build --build-tests --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux"
"command": "swift build --build-tests --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux"
},
"osx": {
"command": "swift build --build-tests --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Darwin"
"command": "swift build --build-tests --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Darwin"
},
"group": "test",
"presentation": {
Expand Down Expand Up @@ -250,7 +250,7 @@
"label": "buildProject_arm64",
"type": "shell",
"linux": {
"command": "swift build --verbose --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux --destination ${env:HOME}/Documents/SwiftCrossCompilers/InstallPackagers/SwiftCrossCompiler/Developer/Destinations/arm64-5.3.3-RELEASE.json"
"command": "swift build --verbose --build-path ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux --destination ${env:HOME}/Documents/SwiftCrossCompilers/InstallPackagers/SwiftCrossCompiler/Developer/Destinations/arm64-5.3.3-RELEASE.json"
},
"osx": {
"command": "echo NO_OP"
Expand All @@ -273,7 +273,7 @@
{
"label": "upload_jetson",
"type": "shell",
"command": "cd ${env:HOME}/Library/Developer/Xcode/DerivedData/SwiftyFan-arm64/debug; rsync -r -l --progress SwiftyFan *.so *.resources 192.168.55.1:~/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux/debug",
"command": "cd ${env:HOME}/Library/Developer/Xcode/DerivedData/AppKidDemo-arm64/debug; rsync -r -l --progress AppKidDemo *.so *.resources 192.168.55.1:~/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux/debug",
"group": "none",
"presentation": {
"echo": false,
Expand Down
2 changes: 1 addition & 1 deletion AppKid/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AppKid

AppKid is an implementation for Application Development Framework heavily inspired by Apple's AppKit and UIKit. It was started as a way to have convenient SDK to build UI applications for X11 enabled GNU/Linux environment with a goal to create SwiftyFan application.
AppKid is an implementation for Application Development Framework heavily inspired by Apple's AppKit and UIKit. It was started as a way to have convenient SDK to build UI applications for X11 enabled GNU/Linux environment with a goal to create AppKidDemo application.
It is implemented completely in swift and is using X11 as a window management and user-initiated events delivery system.
12 changes: 6 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// swift-tools-version:5.5
//
// Package.swift
// SwiftyFan
// AppKidDemo
//
// Created by Serhii Mumriak on 29.01.2020.
//

import PackageDescription

let package = Package(
name: "SwiftyFan",
name: "AppKidDemo",
platforms: [
.macOS(.v12),
],
products: [
.executable(name: "SwiftyFan", targets: ["SwiftyFan"]),
.executable(name: "AppKidDemo", targets: ["AppKidDemo"]),
],
dependencies: [
.package(path: "./TinyFoundation"),
Expand All @@ -25,7 +25,7 @@ let package = Package(
],
targets: [
.executableTarget(
name: "SwiftyFan",
name: "AppKidDemo",
dependencies: [
.product(name: "AppKid", package: "AppKid"),
.product(name: "CairoGraphics", package: "CairoGraphics"),
Expand All @@ -38,8 +38,8 @@ let package = Package(
]
),
.testTarget(
name: "SwiftyFanTests",
dependencies: ["SwiftyFan"]
name: "AppKidDemoTests",
dependencies: ["AppKidDemo"]
),
]
)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SwiftyFan
# AppKidDemo

SwiftyFan is an application written in swift that aims to provide simple and convenient interface to control PWM fans on the given computer.
AppKidDemo is an application written in swift that aims to provide simple and convenient interface to control PWM fans on the given computer.

## Getting Started
#### Dependencies and environment setup
Expand Down
2 changes: 1 addition & 1 deletion SimpleGLM/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ xcuserdata
.Trashes
.swiftpm/

SwiftyFan.executable.link
AppKidDemo.executable.link
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// AppDelegate.swift
// SwiftyFan
// AppKidDemo
//
// Created by Serhii Mumriak on 20.04.2020.
//
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// RootViewController.swift
// SwiftyFan
// AppKidDemo
//
// Created by Serhii Mumriak on 20.04.2020.
//
Expand Down
2 changes: 1 addition & 1 deletion SwiftyGLib/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Build
.Trashes
.swiftpm/
*.volcano.glsl
SwiftyFan.executable.link
AppKidDemo.executable.link
.DS_Store
DerivedData/
.netrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//
// SwiftyFanTests.swift
// SwiftyFan
// AppKidDemoTests.swift
// AppKidDemo
//
// Created by Serhii Mumriak on 29.01.2020.
//

import XCTest
import Foundation

final class SwiftyFanTests: XCTestCase {
final class AppKidDemoTests: XCTestCase {
}
6 changes: 3 additions & 3 deletions Tools/archive/Sources/archive/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ struct Application: DebianPackage {

let swiftRuntimeURL = URL(fileURLWithPath: "/opt/swift/usr/lib/swift/linux/", isDirectory: true)
let swiftRuntimeVersion = Version.numeric(major: 5, minor: 5, patch: 0)
let appKidLibsURL = URL(fileURLWithPath: "/home/palkovnik/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux/release/", isDirectory: true)
let appKidLibsURL = URL(fileURLWithPath: "/home/palkovnik/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux/release/", isDirectory: true)
let appKidLibsVersion = Version.numeric(major: 0, minor: 0, patch: 1)

let swiftRuntime = [
Expand Down Expand Up @@ -189,9 +189,9 @@ let appKidLibs = [
return Library(name: $0, version: appKidLibsVersion, originURL: appKidLibsURL)
}

let swiftyFanApp = Application(name: "SwiftyFan", version: appKidLibsVersion, originURL: appKidLibsURL)
let AppKidDemoApp = Application(name: "AppKidDemo", version: appKidLibsVersion, originURL: appKidLibsURL)

let packages: [DebianPackage] = swiftRuntime + appKidLibs + swiftICULibs + [swiftyFanApp]
let packages: [DebianPackage] = swiftRuntime + appKidLibs + swiftICULibs + [AppKidDemoApp]

let currentDirectoryURL = URL(fileURLWithPath: fileManager.currentDirectoryPath, isDirectory: true)

Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
export APPKID_LOCAL_BUILD=1

ln -sf ~/Library/Developer/Xcode/DerivedData/SwiftyFan-`uname`/debug/SwiftyFan ./SwiftyFan.executable.link
swift build --build-path ~/Library/Developer/Xcode/DerivedData/SwiftyFan-`uname`
ln -sf ~/Library/Developer/Xcode/DerivedData/AppKidDemo-`uname`/debug/AppKidDemo ./AppKidDemo.executable.link
swift build --build-path ~/Library/Developer/Xcode/DerivedData/AppKidDemo-`uname`
2 changes: 1 addition & 1 deletion buildShaders.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ importHeaderSearchPath=./ContentAnimation/Sources/LayerRenderingData/include

mkdir -p $shadersBinariesCodePath

VolcanoSLBuildPath=~/Library/Developer/Xcode/DerivedData/SwiftyFan-Linux
VolcanoSLBuildPath=~/Library/Developer/Xcode/DerivedData/AppKidDemo-Linux
contentAnimationShadersBuildPath=~/Library/Developer/Xcode/DerivedData/ContentAnimationShaders

mkdir -p $contentAnimationShadersBuildPath
Expand Down
Loading

0 comments on commit bf039e5

Please sign in to comment.