chore: update project

hutscape · Dec 24, 2024 · 1cdc0fb · 1cdc0fb
1 parent 56fb8c7
commit 1cdc0fb
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,7 @@
-gem "jekyll", "4.1.1"
+source "https://rubygems.org"
+gem "jekyll", "4.3.4"
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
 gem "webrick"
+gem "csv"
+gem "base64"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,69 +1,174 @@
 GEM
+  remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
+    csv (3.3.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.16.3)
+    ffi (1.17.0)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86-linux-musl)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
     forwardable-extended (2.6.0)
+    google-protobuf (4.29.2)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.29.2-aarch64-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.29.2-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.29.2-x86-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.29.2-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.29.2-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.1)
+    jekyll (4.3.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.4.0)
-      rexml
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.4)
+    public_suffix (6.0.1)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
-    rouge (3.30.0)
+    rexml (3.4.0)
+    rouge (4.5.1)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    sass-embedded (1.83.0)
+      google-protobuf (~> 4.28)
+      rake (>= 13)
+    sass-embedded (1.83.0-aarch64-linux-android)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-aarch64-linux-gnu)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-aarch64-linux-musl)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-aarch64-mingw-ucrt)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-arm-linux-androideabi)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-arm-linux-gnueabihf)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-arm-linux-musleabihf)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-arm64-darwin)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-riscv64-linux-android)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-riscv64-linux-gnu)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-riscv64-linux-musl)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86-cygwin)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86-linux-android)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86-linux-gnu)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86-linux-musl)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86-mingw-ucrt)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86_64-cygwin)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86_64-darwin)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86_64-linux-android)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86_64-linux-gnu)
+      google-protobuf (~> 4.28)
+    sass-embedded (1.83.0-x86_64-linux-musl)
+      google-protobuf (~> 4.28)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.6.0)
+    webrick (1.9.1)
 
 PLATFORMS
-  x86_64-darwin-21
+  aarch64-linux
+  aarch64-linux-android
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  aarch64-mingw-ucrt
+  arm-linux-androideabi
+  arm-linux-gnu
+  arm-linux-gnueabihf
+  arm-linux-musl
+  arm-linux-musleabihf
+  arm64-darwin
+  riscv64-linux-android
+  riscv64-linux-gnu
+  riscv64-linux-musl
+  ruby
+  x86-cygwin
+  x86-linux
+  x86-linux-android
+  x86-linux-gnu
+  x86-linux-musl
+  x86-mingw-ucrt
+  x86_64-cygwin
+  x86_64-darwin
+  x86_64-linux
+  x86_64-linux-android
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  jekyll (= 4.1.1)
+  base64
+  csv
+  jekyll (= 4.3.4)
   tzinfo-data
   webrick
 
 BUNDLED WITH
-   2.4.10
+   2.5.23
diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 BOM_PATH?=_data/bill_of_materials.csv
-XML_PATH?=hardware/*.xml
 
 .PHONY: default serve build install bom
 
@@ -11,13 +10,6 @@ serve:
 build:
 	jekyll build
 
-bom:
-	rm -f $(BOM_PATH)
-	python scripts/bom.py $(XML_PATH) $(BOM_PATH)
-
-stats:
-	python3 scripts/bom_stats.py $(BOM_PATH)
-
 install:
 	echo "Installing git-secrets from awslabs..."
 	brew install git-secrets
@@ -34,14 +26,22 @@ install:
 	echo "Adding .gitignore..."
 	cat scripts/_gitignore > .gitignore
 
+	echo "Adding .gitmodules..."
+	cat scripts/_gitmodules > .gitmodules
+	git submodule update --recursive --remote
+
 	echo "Adding Gemfile and installing ruby gems..."
 	cat scripts/Gemfile > Gemfile
 	bundle install
 
-update:
+submodule:
 	git submodule foreach --recursive git reset --hard HEAD
 	git submodule update --remote
 
+update:
+	rm Gemfile.lock
+	bundle install
+
 uncommit:
 	# git uncommit the last commit
 	git reset --hard HEAD~1

diff --git a/_config.yml b/_config.yml
@@ -10,7 +10,31 @@ paypal: https://www.paypal.com/ncp/payment/4JU23HRF65P66
 github:
   repository_url: https://github.com/hutscape/palm
   raw_content_url: https://github.com/hutscape/palm/tree/master
-exclude: ["datasheets", "Gemfile", "Gemfile.lock", "contributing.md", "Makefile", "readme.md", "test", "scripts"]
+exclude: [
+  "datasheets",
+  "Gemfile",
+  "Gemfile.lock",
+  "contributing.md",
+  "*Makefile",
+  "readme.md",
+  "scripts",
+  "firmware",
+  "*.h",
+  "*.ino",
+  "*.bin",
+  "*.elf",
+  "*.map",
+  "*.kicad*",
+  "pcb/fp-*",
+  "pcb/sym-lib-table",
+  "pcb/library",
+  "*.FCStd",
+  "*.stl",
+  "*.FCBak",
+  "*-backups",
+  "references",
+  "_code/**/*",
+  ]
 include: ["_data"]
 collections:
   code:

diff --git a/scripts b/scripts
+5 −1		Gemfile
+1 −1		_LICENSE.md
+14 −8		_Makefile
+7 −0		_gitignore
+0 −83		bom.py
+0 −94		bom_stats.py
+0 −769		kicad_netlist_reader.py