mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	build fixes
This commit is contained in:
		@@ -14,12 +14,14 @@ rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
 | 
				
			|||||||
rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
 | 
					rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
 | 
				
			||||||
rm -r $SRC_DIR/node_modules/giflossy/vendor/*
 | 
					rm -r $SRC_DIR/node_modules/giflossy/vendor/*
 | 
				
			||||||
rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
 | 
					rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
 | 
				
			||||||
 | 
					rm -r $SRC_DIR/node_modules/keyboard-layout/build/Release/*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
 | 
					cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
 | 
				
			||||||
cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
 | 
					cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
 | 
				
			||||||
cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
 | 
					cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
 | 
				
			||||||
cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
 | 
					cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
 | 
				
			||||||
cp bin/deps/mac-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
 | 
					cp bin/deps/mac-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
 | 
				
			||||||
 | 
					cp bin/deps/mac-x64/keyboard-layout-manager.node $SRC_DIR/node_modules/keyboard-layout/build/Release/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
 | 
					./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
#!/usr/bin/env bash
 | 
					#!/usr/bin/env bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PKG_DIR=dist/trilium-linux-x64-server-src
 | 
					PKG_DIR=dist/trilium-linux-x64-server
 | 
				
			||||||
NODE_VERSION=12.12.0
 | 
					NODE_VERSION=12.12.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ "$1" != "DONTCOPY" ]
 | 
					if [ "$1" != "DONTCOPY" ]
 | 
				
			||||||
@@ -29,4 +29,4 @@ VERSION=`jq -r ".version" package.json`
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
cd dist
 | 
					cd dist
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server-src
 | 
					tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@ bin/copy-trilium.sh $SRC_DIR
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# we'll just copy the same SRC dir to all the builds so we don't have to do npm install in each separately
 | 
					# we'll just copy the same SRC dir to all the builds so we don't have to do npm install in each separately
 | 
				
			||||||
cp -r $SRC_DIR ./dist/trilium-linux-x64-src
 | 
					cp -r $SRC_DIR ./dist/trilium-linux-x64-src
 | 
				
			||||||
cp -r $SRC_DIR ./dist/trilium-linux-x64-server-src
 | 
					cp -r $SRC_DIR ./dist/trilium-linux-x64-server
 | 
				
			||||||
cp -r $SRC_DIR ./dist/trilium-windows-x64-src
 | 
					cp -r $SRC_DIR ./dist/trilium-windows-x64-src
 | 
				
			||||||
cp -r $SRC_DIR ./dist/trilium-mac-x64-src
 | 
					cp -r $SRC_DIR ./dist/trilium-mac-x64-src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								bin/deps/mac-x64/keyboard-layout-manager.node
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bin/deps/mac-x64/keyboard-layout-manager.node
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user