GH workflow for Xcframework

Author: Carlos Cabanero

.github/CODEOWNERS renamed to .github.vim/CODEOWNERS

@@ -0,0 +1,63 @@
+name: CI
+
+# On workflows change, while we test.
+# Run the script (add Downloads to frameworks)
+# Create release, etc...
+
+on:
+  push:
+    branches:
+    - 'workflows*'
+    tags:
+    - 'v*'
+
+jobs:
+  build:
+    name: Building release assets
+    runs-on: macOS-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: xcode-select
+      run: sudo xcode-select -s /Applications/Xcode.app
+
+    - name: Delete release notes
+      run: rm -f .build/release.md
+
+    - name: Run build
+      run: swift run
+
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        body_path: release.md
+        draft: false
+        prerelease: false
+
+    - name: Upload vim Xcframework
+      id: upload-release-vim-xcframework-zip
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./vim.xcframework.zip
+        asset_name: vim.xcframework.zip
+        asset_content_type: application/zip
+
+    - name: Upload xxd Xcframework
+      id: upload-release-xxd-xcframework-zip
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./xxd.xcframework.zip
+        asset_name: xxd.xcframework.zip
+        asset_content_type: application/zip

.github/FUNDING.yml renamed to .github.vim/FUNDING.yml

@@ -1,24 +1,20 @@
 // swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
-    name: "vim",
-    products: [
-        .library(name: "vim", targets: ["vim"])
-    ],
-    dependencies: [
-    ],
-    targets: [
-        .binaryTarget(
-            name: "vim",
-            url: "https://github.com/holzschu/vim/releases/download/ios_1.0/vim.xcframework.zip",
-            checksum: "02acb74bec3e6b4ba9c120873a19a770773e3c3e2d141365808a9342ddf41fe7"
-        ),
-        .binaryTarget(
-            name: "xxd",
-            url: "https://github.com/holzschu/vim/releases/download/ios_1.0/xxd.xcframework.zip",
-            checksum: "1c48b9f77310b71499a7bd76a16882405c8a81b55f56c7c7577ae2a0ce347ba6"
-        )
-    ]
+  name: "vim",
+  platforms: [.macOS("11")],
+  dependencies: [
+    .package(url: "https://github.com/blinksh/FMake", from : "0.0.16"),
+    //    .package(path: "../FMake")
+  ],
+  targets: [
+    // Targets are the basic building blocks of a package, defining a module or a test suite.
+    // Targets can depend on other targets in this package and products from dependencies.
+    .target(
+      name: "vim",
+      dependencies: ["FMake"]),
+  ]
 )

.github/ISSUE_TEMPLATE/bug_report.yml renamed to .github.vim/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,20 @@
+import FMake
+import Foundation
+
+OutputLevel.default = .error
+
+try? sh("./get_frameworks.sh")
+try? sh("./build_vim_xcframework.sh")
+
+let vimXcframeworkZipName = "vim.xcframework.zip"
+let xxdXcframeworkZipName = "xxd.xcframework.zip"
+
+let releaseMD =
+  """
+  | File                          | SHA256                                       |
+  | ----------------------------- |:--------------------------------------------:|
+  | \(vimXcframeworkZipName)      | \(try sha(path: vimXcframeworkZipName))      |
+  | \(xxdXcframeworkZipName)      | \(try sha(path: xxdXcframeworkZipName))      |
+  """
+
+try write(content: releaseMD, atPath: "release.md")

.github/ISSUE_TEMPLATE/feature_request.md renamed to .github.vim/ISSUE_TEMPLATE/feature_request.md

@@ -9,8 +9,9 @@ SIM_SDKROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)
 
 echo "Building for iOS:"
 FRAMEWORKS=$PWD/Frameworks_iOS
-# rm Frameworks
-# ln -s Frameworks Frameworks_iOS
+mkdir -p $FRAMEWORKS
+rm $FRAMEWORKS/ios_system.framework
+ln -s $PWD/Frameworks/ios_system.xcframework/ios-arm64/ios_system.framework $FRAMEWORKS/ios_system.framework
 
 make distclean
 # 1) configure
@@ -50,11 +51,11 @@ signature=${framework//_/-}
 plutil -replace CFBundleIdentifier -string Nicolas-Holzschuch.$signature  $FRAMEWORKS/$framework.framework/Info.plist
 install_name_tool -id @rpath/$framework.framework/$framework  $FRAMEWORKS/$framework.framework/$framework
 
-
 echo "Building for Simulator:"
 FRAMEWORKS=$PWD/Frameworks_Simulator
-# rm Frameworks
-# ln -s Frameworks Frameworks_Simulator
+mkdir -p $FRAMEWORKS
+rm $FRAMEWORKS/ios_system.framework
+ln -s $PWD/Frameworks/ios_system.xcframework/ios-arm64_x86_64-simulator/ios_system.framework $FRAMEWORKS/ios_system.framework
 
 make distclean
 # --disable-channel

.github/dependabot.yml renamed to .github.vim/dependabot.yml

@@ -1,20 +1,18 @@
 #!/bin/bash
 
-IOS_SYSTEM_VER="2.4"
-
-HHROOT="https://github.com/holzschu"
-
 mkdir -p "${BASH_SOURCE%/*}/Frameworks"
 
 (cd "${BASH_SOURCE%/*}/Frameworks"
-# ios_system
+# ios_system - Blink only depends on ios_system, as it doesn't include lua or python, etc...
 echo "Downloading Frameworks:"
-curl -OL $HHROOT/ios_system/releases/download/v$IOS_SYSTEM_VER/release.tar.gz
-( tar -xzf release.tar.gz --strip 1 && rm release.tar.gz ) || { echo "ios_system failed to download"; exit 1; }
-)
-
-(cd "${BASH_SOURCE%/*}/src/"
-# ios_error.h
-curl -OL $HHROOT/ios_system/releases/download/v$IOS_SYSTEM_VER/ios_error.h
+curl -OL https://github.com/holzschu/ios_system/releases/download/v3.0.3/ios_system.xcframework.zip
+sha=$( shasum -a 256 ios_system.xcframework.zip | cut -d' ' -f1 )
+[[ "$sha" == "50f1692873e73fd862f45f73f2c08745e822c01ff5e0a0e0aec7fed6bb946e7f" ]] && echo "sha matches" || exit 1
+unzip ios_system.xcframework.zip && rm ios_system.xcframework.zip
 )
 
+# Commented. Made part of the repo to simplify Blink customization
+# (cd "${BASH_SOURCE%/*}/src/"
+# # ios_error.h
+# curl -OL $HHROOT/ios_system/releases/download/v$IOS_SYSTEM_VER/ios_error.h
+# )