From d95e9bf9cef85d6b426a6fbd452db70d325ff0d4 Mon Sep 17 00:00:00 2001 From: hneemann Date: Thu, 20 Feb 2020 08:55:30 +0100 Subject: [PATCH] moved the "lib" folder, see #33 --- distribution/Assembly.xml | 2 +- distribution/ReleaseNotes.txt | 1 + .../neemann/digital/draw/library/ElementLibrary.java | 2 +- src/test/resources/docu/static_de.xml | 8 ++++++++ src/test/resources/docu/static_en.xml | 10 +++++++++- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/distribution/Assembly.xml b/distribution/Assembly.xml index 2a3cb2ea5..a6d5cf27c 100644 --- a/distribution/Assembly.xml +++ b/distribution/Assembly.xml @@ -57,7 +57,7 @@ ${basedir}/src/main/dig/lib - /examples/lib/ + /lib/ **/*.dig **/*.txt diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt index 86f8ee57e..f8be27041 100644 --- a/distribution/ReleaseNotes.txt +++ b/distribution/ReleaseNotes.txt @@ -1,6 +1,7 @@ Release Notes Head, planned as v0.25 +- move the "lib" folder from the "examples" folder to the root folder. - 74193 was added v0.24, released on 1. Feb. 2020 diff --git a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java index c29c20e47..3117a6308 100644 --- a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java +++ b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java @@ -71,7 +71,7 @@ public class ElementLibrary implements Iterable if (path.endsWith("/target/Digital.jar")) return new File(path.substring(0, path.length() - 19) + "/src/main/dig/lib"); if (path.endsWith("Digital.jar")) - return new File(path.substring(0, path.length() - 12) + "/examples/lib"); + return new File(path.substring(0, path.length() - 12) + "/lib"); return new File("noLibFound"); } diff --git a/src/test/resources/docu/static_de.xml b/src/test/resources/docu/static_de.xml index e1cf97154..9d4ca948d 100644 --- a/src/test/resources/docu/static_de.xml +++ b/src/test/resources/docu/static_de.xml @@ -664,6 +664,14 @@ erforderlich. + + Ich habe eine Schaltung erstellt, welche ich in vielen anderen Schaltungen verwenden möchte. + Wie kann ich das ermöglichen, ohne die Datei immer wieder in die entsprechenden Ordner zu kopieren? + + Die Schaltung kann im "lib" Ordner gespeichert werden. Dann ist sie in allen anderen Schaltungen + verfügbar. + + diff --git a/src/test/resources/docu/static_en.xml b/src/test/resources/docu/static_en.xml index 10d4bfb1b..5195260e2 100644 --- a/src/test/resources/docu/static_en.xml +++ b/src/test/resources/docu/static_en.xml @@ -593,7 +593,8 @@ When creating a JEDEC file: How to assign a pin number to a certain signal? - At the corresponding inputs and outputs you can enter a pin number in the settings dialog of the pin. + At the corresponding inputs and outputs you can enter a pin number in the settings dialog of the + pin. @@ -601,6 +602,13 @@ To program such a chip a special programmer hardware is necessary. + + I have created a circuit that I want to use in many other circuits. + How can I do this without copying the file over and over again into the appropriate folders? + + The circuit can be saved in the "lib" folder. Then it is available in all other circuits. + +