mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	Revert "build: Investigate not embedding better_sqlite3 natives"
This reverts commit 0e10fbb0875e515b6c10d4d010fe81464b41f6b4.
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								bin/better-sqlite3/linux-desktop-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bin/better-sqlite3/linux-desktop-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								bin/better-sqlite3/linux-server-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bin/better-sqlite3/linux-server-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								bin/better-sqlite3/mac-arm64-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bin/better-sqlite3/mac-arm64-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								bin/better-sqlite3/mac-x64-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bin/better-sqlite3/mac-x64-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								bin/better-sqlite3/win-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bin/better-sqlite3/win-better_sqlite3.node
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -26,6 +26,9 @@ SRC_DIR=./dist/trilium-linux-x64-src
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
rm -r "$SRC_DIR"/src/public/app-dist/*.mobile.*
 | 
					rm -r "$SRC_DIR"/src/public/app-dist/*.mobile.*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					echo "Copying required linux-x64 binaries"
 | 
				
			||||||
 | 
					cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node "$SRC_DIR"/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Packaging linux x64 electron build"
 | 
					echo "Packaging linux x64 electron build"
 | 
				
			||||||
./node_modules/.bin/electron-packager "$SRC_DIR" --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 | 
					./node_modules/.bin/electron-packager "$SRC_DIR" --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,6 +7,10 @@ then
 | 
				
			|||||||
    ./bin/copy-trilium.sh $SRC_DIR
 | 
					    ./bin/copy-trilium.sh $SRC_DIR
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					echo "Copying required mac arm64 binaries"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					cp -r bin/better-sqlite3/mac-arm64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 | 
				
			||||||
 | 
					
 | 
				
			||||||
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
					rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Packaging mac arm64 electron build"
 | 
					echo "Packaging mac arm64 electron build"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,6 +9,8 @@ fi
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
echo "Copying required mac x64 binaries"
 | 
					echo "Copying required mac x64 binaries"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					cp -r bin/better-sqlite3/mac-x64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 | 
				
			||||||
 | 
					
 | 
				
			||||||
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
					rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Packaging mac x64 electron build"
 | 
					echo "Packaging mac x64 electron build"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,6 +23,8 @@ rm -r $PKG_DIR/node_modules/electron*
 | 
				
			|||||||
rm -r $PKG_DIR/webpack*
 | 
					rm -r $PKG_DIR/webpack*
 | 
				
			||||||
rm -r $PKG_DIR/electron.js
 | 
					rm -r $PKG_DIR/electron.js
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 | 
				
			||||||
 | 
					
 | 
				
			||||||
printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
 | 
					printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
 | 
				
			||||||
chmod 755 $PKG_DIR/trilium.sh
 | 
					chmod 755 $PKG_DIR/trilium.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,6 +12,10 @@ then
 | 
				
			|||||||
    ./bin/copy-trilium.sh $SRC_DIR
 | 
					    ./bin/copy-trilium.sh $SRC_DIR
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					echo "Copying required windows binaries"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					cp -r bin/better-sqlite3/win-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 | 
				
			||||||
 | 
					
 | 
				
			||||||
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
					rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Packaging windows x64 electron build"
 | 
					echo "Packaging windows x64 electron build"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,6 +12,7 @@
 | 
				
			|||||||
      <excludeFolder url="file://$MODULE_DIR$/libraries" />
 | 
					      <excludeFolder url="file://$MODULE_DIR$/libraries" />
 | 
				
			||||||
      <excludeFolder url="file://$MODULE_DIR$/libraries" />
 | 
					      <excludeFolder url="file://$MODULE_DIR$/libraries" />
 | 
				
			||||||
      <excludeFolder url="file://$MODULE_DIR$/docs" />
 | 
					      <excludeFolder url="file://$MODULE_DIR$/docs" />
 | 
				
			||||||
 | 
					      <excludeFolder url="file://$MODULE_DIR$/bin/better-sqlite3" />
 | 
				
			||||||
      <excludeFolder url="file://$MODULE_DIR$/data" />
 | 
					      <excludeFolder url="file://$MODULE_DIR$/data" />
 | 
				
			||||||
      <excludeFolder url="file://$MODULE_DIR$/.flatpak-builder" />
 | 
					      <excludeFolder url="file://$MODULE_DIR$/.flatpak-builder" />
 | 
				
			||||||
    </content>
 | 
					    </content>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user