From 6d905bab2b2faff71638fa4a5b07165b1b34eea9 Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Thu, 16 Aug 2018 14:29:20 -0500 Subject: [PATCH 01/10] resolved warnings, needs newer nativelibs parent --- .idea/compiler.xml | 31 +++++++ .idea/encodings.xml | 14 +++ .idea/vcs.xml | 6 ++ .project | 6 ++ anarres/anarres-jnaerator.iml | 23 +++++ anarres/lib/findbugs/xsl/fancy-hist.xsl | 2 +- anarres/lib/findbugs/xsl/fancy.xsl | 2 +- .../main/java/org/anarres/cpp/CppReader.java | 12 ++- .../java/org/anarres/cpp/FileLexerSource.java | 4 + .../org/anarres/cpp/InputLexerSource.java | 12 ++- .../src/main/java/org/anarres/cpp/Macro.java | 20 +++-- .../org/anarres/cpp/PreprocessorListener.java | 10 +++ .../src/main/java/org/anarres/cpp/Source.java | 28 +++--- .../java/org/anarres/cpp/SourceIterator.java | 2 +- .../org/anarres/cpp/StringLexerSource.java | 4 + .../org/anarres/cpp/Preprocessor.java | 74 +++++++++------ .../main/velocity/org/anarres/cpp/Token.java | 15 ++-- jnaerator-maven-plugin/.classpath | 46 ++++++++++ .../.gitignore | 0 .../.project | 8 +- .../.settings/org.eclipse.jdt.core.prefs | 4 +- .../.settings/org.maven.ide.eclipse.prefs | 0 .../jnearator-maven-plugin.iml | 59 ++++++++++++ .../maven-jnaerator-plugin.iml | 59 ++++++++++++ .../pom.xml | 2 +- .../java/com/jnaerator/JNAeratorMojo.java | 10 +-- jnaerator-parent.iml | 14 +++ jnaerator-parser/.classpath | 43 ++++++++- jnaerator-parser/.project | 6 ++ .../.settings/org.eclipse.jdt.core.prefs | 10 ++- jnaerator-parser/jnaerator-parser.iml | 23 +++++ jnaerator-rococoa-runtime/.classpath | 43 ++++++++- jnaerator-rococoa-runtime/.project | 6 ++ .../.settings/org.eclipse.jdt.core.prefs | 10 ++- .../jnaerator-rococoa-runtime.iml | 23 +++++ jnaerator-runtime/.classpath | 48 +++++++++- jnaerator-runtime/.project | 6 ++ .../.settings/org.eclipse.jdt.core.prefs | 10 ++- jnaerator-runtime/jnaerator-runtime.iml | 20 +++++ .../lang/jnaerator/runtime/NativeSize.java | 5 +- .../lang/jnaerator/runtime/Structure.java | 13 ++- .../ochafik/lang/jnaerator/runtime/Union.java | 1 + jnaerator/.classpath | 54 ++++++++++- jnaerator/.project | 6 ++ .../.settings/org.eclipse.jdt.core.prefs | 4 +- jnaerator/jnaerator.iml | 37 ++++++++ jnaerator/pom.xml | 10 +++ .../com/ochafik/lang/jnaerator/JNAerator.java | 19 ++-- .../lang/jnaerator/JNAeratorConfig.java | 2 +- .../lang/jnaerator/JNAeratorConfigUtils.java | 1 + .../com/ochafik/lang/jnaerator/Result.java | 6 +- .../ochafik/lang/jnaerator/Signatures.java | 3 + .../com/ochafik/lang/jnaerator/head.vm | 4 +- .../com/ochafik/lang/jnaerator/tail.vm | 4 +- maven-jnaerator-plugin/.classpath | 9 -- ochafik-swing/.classpath | 43 ++++++++- ochafik-swing/.project | 6 ++ .../.settings/org.eclipse.jdt.core.prefs | 10 ++- ochafik-swing/ochafik-swing.iml | 17 ++++ .../syntaxcoloring/DefaultInputHandler.java | 3 +- .../swing/syntaxcoloring/InputHandler.java | 17 ++-- .../swing/syntaxcoloring/JEditTextArea.java | 89 ++++++++++--------- .../swing/syntaxcoloring/KeywordMap.java | 3 +- .../swing/syntaxcoloring/SyntaxDocument.java | 2 +- .../swing/syntaxcoloring/SyntaxStyle.java | 16 ++-- .../swing/syntaxcoloring/SyntaxUtilities.java | 4 +- .../syntaxcoloring/TextAreaDefaults.java | 2 +- .../swing/syntaxcoloring/TextAreaPainter.java | 36 ++++---- .../swing/syntaxcoloring/TextUtilities.java | 6 +- .../swing/syntaxcoloring/TokenMarker.java | 9 +- ochafik-util/.classpath | 43 ++++++++- ochafik-util/.project | 6 ++ .../.settings/org.eclipse.jdt.core.prefs | 10 ++- ochafik-util/ochafik-util.iml | 16 ++++ .../main/java/com/ochafik/lang/Threads.java | 3 +- pom.xml | 4 +- 76 files changed, 1015 insertions(+), 223 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/vcs.xml create mode 100644 anarres/anarres-jnaerator.iml create mode 100644 jnaerator-maven-plugin/.classpath rename {maven-jnaerator-plugin => jnaerator-maven-plugin}/.gitignore (100%) rename {maven-jnaerator-plugin => jnaerator-maven-plugin}/.project (77%) rename {maven-jnaerator-plugin => jnaerator-maven-plugin}/.settings/org.eclipse.jdt.core.prefs (50%) rename {maven-jnaerator-plugin => jnaerator-maven-plugin}/.settings/org.maven.ide.eclipse.prefs (100%) create mode 100644 jnaerator-maven-plugin/jnearator-maven-plugin.iml create mode 100644 jnaerator-maven-plugin/maven-jnaerator-plugin.iml rename {maven-jnaerator-plugin => jnaerator-maven-plugin}/pom.xml (98%) rename {maven-jnaerator-plugin => jnaerator-maven-plugin}/src/main/java/com/jnaerator/JNAeratorMojo.java (90%) create mode 100644 jnaerator-parent.iml create mode 100644 jnaerator-parser/jnaerator-parser.iml create mode 100644 jnaerator-rococoa-runtime/jnaerator-rococoa-runtime.iml create mode 100644 jnaerator-runtime/jnaerator-runtime.iml create mode 100644 jnaerator/jnaerator.iml delete mode 100644 maven-jnaerator-plugin/.classpath create mode 100644 ochafik-swing/ochafik-swing.iml create mode 100644 ochafik-util/ochafik-util.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..9297919b --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..20f60ce7 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.project b/.project index 79988b3b..76116963 100644 --- a/.project +++ b/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature org.eclipse.jdt.core.javanature diff --git a/anarres/anarres-jnaerator.iml b/anarres/anarres-jnaerator.iml new file mode 100644 index 00000000..c42ca42b --- /dev/null +++ b/anarres/anarres-jnaerator.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anarres/lib/findbugs/xsl/fancy-hist.xsl b/anarres/lib/findbugs/xsl/fancy-hist.xsl index 80866007..3fd4f4d1 100644 --- a/anarres/lib/findbugs/xsl/fancy-hist.xsl +++ b/anarres/lib/findbugs/xsl/fancy-hist.xsl @@ -1,4 +1,4 @@ - + com.nativelibs4java - maven-jnaerator-plugin + jnaerator-maven-plugin ${jnaerator_version} @@ -31,7 +31,7 @@ com.nativelibs4java - maven-jnaerator-plugin + jnaerator-maven-plugin ${jnaerator_version} src/main/java diff --git a/maven-jnaerator-plugin/.classpath b/maven-jnaerator-plugin/.classpath deleted file mode 100644 index 4cf68d6b..00000000 --- a/maven-jnaerator-plugin/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/ochafik-swing/.classpath b/ochafik-swing/.classpath index 4cf68d6b..9bef8d6b 100644 --- a/ochafik-swing/.classpath +++ b/ochafik-swing/.classpath @@ -1,9 +1,46 @@ - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ochafik-swing/.project b/ochafik-swing/.project index 579f5a8b..4406e28a 100644 --- a/ochafik-swing/.project +++ b/ochafik-swing/.project @@ -20,8 +20,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature org.eclipse.iam.jdt.core.mavenNature org.eclipse.jdt.core.javanature diff --git a/ochafik-swing/.settings/org.eclipse.jdt.core.prefs b/ochafik-swing/.settings/org.eclipse.jdt.core.prefs index 9cf8f359..cf4d3d81 100644 --- a/ochafik-swing/.settings/org.eclipse.jdt.core.prefs +++ b/ochafik-swing/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,7 @@ -#Thu Jan 28 23:48:13 CET 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/ochafik-swing/ochafik-swing.iml b/ochafik-swing/ochafik-swing.iml new file mode 100644 index 00000000..0caada81 --- /dev/null +++ b/ochafik-swing/ochafik-swing.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/DefaultInputHandler.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/DefaultInputHandler.java index f913d7b8..e82323c9 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/DefaultInputHandler.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/DefaultInputHandler.java @@ -146,7 +146,7 @@ public void removeAllKeyBindings() } /** - * Returns a copy of this input handler that shares the same + * @return a copy of this input handler that shares the same * key bindings. Setting key bindings in the copy will also * set them in the original. */ @@ -287,6 +287,7 @@ else if(o instanceof ActionListener) * or a keycode name from the KeyEvent class, without * the VK_ prefix. * @param keyStroke A string description of the key stroke + * @return The KeyStroke object associated with the input string */ public static KeyStroke parseKeyStroke(String keyStroke) { diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/InputHandler.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/InputHandler.java index c6d3d4d6..e492c623 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/InputHandler.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/InputHandler.java @@ -175,7 +175,7 @@ public abstract class InputHandler extends KeyAdapter } /** - * Returns a named text area action. + * @return a named text area action. * @param name The action name */ public static ActionListener getAction(String name) @@ -184,7 +184,7 @@ public static ActionListener getAction(String name) } /** - * Returns the name of the specified text area action. + * @return the name of the specified text area action. * @param listener The action listener */ public static String getActionName(ActionListener listener) @@ -201,7 +201,7 @@ public static String getActionName(ActionListener listener) } /** - * Returns an enumeration of all available actions. + * @return an enumeration of all available actions. */ public static Enumeration getActions() { @@ -246,7 +246,7 @@ public void grabNextKeyStroke(ActionListener listener) } /** - * Returns if repeating is enabled. When repeating is enabled, + * @return if repeating is enabled. When repeating is enabled, * actions will be executed multiple times. This is usually * invoked with a special key stroke in the input handler. */ @@ -259,6 +259,7 @@ public boolean isRepeatEnabled() * Enables repeating. When repeating is enabled, actions will be * executed multiple times. Once repeating is enabled, the input * handler should read a number from the keyboard. + * @param repeat true enables repeating */ public void setRepeatEnabled(boolean repeat) { @@ -266,7 +267,7 @@ public void setRepeatEnabled(boolean repeat) } /** - * Returns the number of times the next action will be repeated. + * @return the number of times the next action will be repeated. */ public int getRepeatCount() { @@ -283,7 +284,7 @@ public void setRepeatCount(int repeatCount) } /** - * Returns the macro recorder. If this is non-null, all executed + * @return the macro recorder. If this is non-null, all executed * actions should be forwarded to the recorder. */ public InputHandler.MacroRecorder getMacroRecorder() @@ -302,7 +303,7 @@ public void setMacroRecorder(InputHandler.MacroRecorder recorder) } /** - * Returns a copy of this input handler that shares the same + * @return a copy of this input handler that shares the same * key bindings. Setting key bindings in the copy will also * set them in the original. */ @@ -370,7 +371,7 @@ public void executeAction(ActionListener listener, Object source, } /** - * Returns the text area that fired the specified event. + * @return the text area that fired the specified event. * @param evt The event */ public static JEditTextArea getTextArea(EventObject evt) diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/JEditTextArea.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/JEditTextArea.java index d106ce84..5489dac6 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/JEditTextArea.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/JEditTextArea.java @@ -156,7 +156,7 @@ public JEditTextArea(TextAreaDefaults defaults) } /** - * Returns if this component can be traversed by pressing + * @return if this component can be traversed by pressing * the Tab key. This returns false. */ public final boolean isFocusable() @@ -165,7 +165,7 @@ public final boolean isFocusable() } /** - * Returns the object responsible for painting this text area. + * @return the object responsible for painting this text area. */ public final TextAreaPainter getPainter() { @@ -173,7 +173,7 @@ public final TextAreaPainter getPainter() } /** - * Returns the input handler. + * @return the input handler. */ public final InputHandler getInputHandler() { @@ -190,7 +190,7 @@ public void setInputHandler(InputHandler inputHandler) } /** - * Returns true if the caret is blinking, false otherwise. + * @return true if the caret is blinking, false otherwise. */ public final boolean isCaretBlinkEnabled() { @@ -211,7 +211,7 @@ public void setCaretBlinkEnabled(boolean caretBlinks) } /** - * Returns true if the caret is visible, false otherwise. + * @return true if the caret is visible, false otherwise. */ public final boolean isCaretVisible() { @@ -246,7 +246,7 @@ public final void blinkCaret() } /** - * Returns the number of lines from the top and button of the + * @return the number of lines from the top and button of the * text area that are always visible. */ public final int getElectricScroll() @@ -290,7 +290,7 @@ public void updateScrollBars() } /** - * Returns the line displayed at the text area's origin. + * @return the line displayed at the text area's origin. */ public final int getFirstLine() { @@ -300,6 +300,7 @@ public final int getFirstLine() /** * Sets the line displayed at the text area's origin without * updating the scroll bars. + * @param firstLine The position of the first line in lines */ public void setFirstLine(int firstLine) { @@ -312,7 +313,7 @@ public void setFirstLine(int firstLine) } /** - * Returns the number of lines visible in this text area. + * @return the number of lines visible in this text area. */ public final int getVisibleLines() { @@ -334,7 +335,7 @@ public final void recalculateVisibleLines() } /** - * Returns the horizontal offset of drawn lines. + * @return the horizontal offset of drawn lines. */ public final int getHorizontalOffset() { @@ -456,8 +457,9 @@ else if(x + width >= painter.getWidth()) } /** - * Converts a line index to a y co-ordinate. + * Converts a line index to a y coordinate. * @param line The line + * @return The y coordinate */ public int lineToY(int line) { @@ -473,8 +475,9 @@ public int lineToBottomY(int line) } /** - * Converts a y co-ordinate to a line index. - * @param y The y co-ordinate + * Converts a y coordinate to a line index. + * @param y The y coordinate + * @return The line index */ public int yToLine(int y) { @@ -489,6 +492,7 @@ public int yToLine(int y) * slow version that can be used any time. * @param line The line * @param offset The offset, from the start of the line + * @return The X coordinate */ public final int offsetToX(int line, int offset) { @@ -503,6 +507,7 @@ public final int offsetToX(int line, int offset) * to the text since the last repaint. * @param line The line * @param offset The offset, from the start of the line + * @return The X coordinate */ public int _offsetToX(int line, int offset) { @@ -580,6 +585,7 @@ public int _offsetToX(int line, int offset) * Converts an x co-ordinate to an offset within a line. * @param line The line * @param x The x co-ordinate + * @return the offset within the line */ public int xToOffset(int line, int x) { @@ -690,6 +696,7 @@ public int xToOffset(int line, int x) * Converts a point to an offset, from the start of the text. * @param x The x co-ordinate of the point * @param y The y co-ordinate of the point + * @return The offset from the start of the text */ public int xyToOffset(int x, int y) { @@ -699,7 +706,7 @@ public int xyToOffset(int x, int y) } /** - * Returns the document this text area is editing. + * @return the document this text area is editing. */ public final SyntaxDocument getDocument() { @@ -726,7 +733,7 @@ public void setDocument(SyntaxDocument document) } /** - * Returns the document's token marker. Equivalent to calling + * @return the document's token marker. Equivalent to calling * getDocument().getTokenMarker(). */ public final TokenMarker getTokenMarker() @@ -745,7 +752,7 @@ public final void setTokenMarker(TokenMarker tokenMarker) } /** - * Returns the length of the document. Equivalent to calling + * @return the length of the document. Equivalent to calling * getDocument().getLength(). */ public final int getDocumentLength() @@ -754,7 +761,7 @@ public final int getDocumentLength() } /** - * Returns the number of lines in the document. + * @return the number of lines in the document. */ public final int getLineCount() { @@ -762,7 +769,7 @@ public final int getLineCount() } /** - * Returns the line containing the specified offset. + * @return the line containing the specified offset. * @param offset The offset */ public final int getLineOfOffset(int offset) @@ -771,7 +778,6 @@ public final int getLineOfOffset(int offset) } /** - * Returns the start offset of the specified line. * @param line The line * @return The start offset of the specified line, or -1 if the line is * invalid @@ -787,7 +793,6 @@ public int getLineStartOffset(int line) } /** - * Returns the end offset of the specified line. * @param line The line * @return The end offset of the specified line, or -1 if the line is * invalid. @@ -803,7 +808,7 @@ public int getLineEndOffset(int line) } /** - * Returns the length of the specified line. + * @return the length of the specified line. * @param line The line */ public int getLineLength(int line) @@ -818,7 +823,7 @@ public int getLineLength(int line) } /** - * Returns the entire text of this text area. + * @return the entire text of this text area. */ public String getText() { @@ -835,6 +840,7 @@ public String getText() /** * Sets the entire text of this text area. + * @param text The entire text */ public void setText(String text) { @@ -908,6 +914,7 @@ public final String getLineText(int lineIndex) * Copies the text on the specified line into a segment. If the line * is invalid, the segment will contain a null string. * @param lineIndex The line + * @param segment into which the line is copied */ public final void getLineText(int lineIndex, Segment segment) { @@ -916,7 +923,7 @@ public final void getLineText(int lineIndex, Segment segment) } /** - * Returns the selection start offset. + * @return the selection start offset. */ public final int getSelectionStart() { @@ -924,8 +931,8 @@ public final int getSelectionStart() } /** - * Returns the offset where the selection starts on the specified - * line. + * @return the offset where the selection starts on the specified line. + * @param line containing a selection */ public int getSelectionStart(int line) { @@ -947,7 +954,7 @@ else if(rectSelect) } /** - * Returns the selection start line. + * @return the selection start line. */ public final int getSelectionStartLine() { @@ -966,7 +973,7 @@ public final void setSelectionStart(int selectionStart) } /** - * Returns the selection end offset. + * @return the selection end offset. */ public final int getSelectionEnd() { @@ -974,8 +981,8 @@ public final int getSelectionEnd() } /** - * Returns the offset where the selection ends on the specified - * line. + * @return the offset where the selection ends on the specified line. + * @param line into which the offset is measured */ public int getSelectionEnd(int line) { @@ -997,7 +1004,7 @@ else if(rectSelect) } /** - * Returns the selection end line. + * @return the selection end line. */ public final int getSelectionEndLine() { @@ -1016,7 +1023,7 @@ public final void setSelectionEnd(int selectionEnd) } /** - * Returns the caret position. This will either be the selection + * @return the caret position. This will either be the selection * start or the selection end, depending on which direction the * selection was made in. */ @@ -1026,7 +1033,7 @@ public final int getCaretPosition() } /** - * Returns the caret line. + * @return the caret line. */ public final int getCaretLine() { @@ -1034,7 +1041,7 @@ public final int getCaretLine() } /** - * Returns the mark position. This will be the opposite selection + * @return the mark position. This will be the opposite selection * bound to the caret position. * @see #getCaretPosition() */ @@ -1044,7 +1051,7 @@ public final int getMarkPosition() } /** - * Returns the mark line. + * @return the mark line. */ public final int getMarkLine() { @@ -1159,7 +1166,7 @@ public void select(int start, int end) } /** - * Returns the selected text, or null if no selection is active. + * @return the selected text, or null if no selection is active. */ public final String getSelectedText() { @@ -1312,7 +1319,7 @@ public void setSelectedText(String selectedText) } /** - * Returns true if this text area is editable, false otherwise. + * @return true if this text area is editable, false otherwise. */ public final boolean isEditable() { @@ -1330,7 +1337,7 @@ public final void setEditable(boolean editable) } /** - * Returns the right click popup menu. + * @return the right click popup menu. */ public final JPopupMenu getRightClickPopup() { @@ -1347,7 +1354,7 @@ public final void setRightClickPopup(JPopupMenu popup) } /** - * Returns the `magic' caret position. This can be used to preserve + * @return the `magic' caret position. This can be used to preserve * the column position when moving up and down lines. */ public final int getMagicCaretPosition() @@ -1409,7 +1416,7 @@ public void overwriteSetSelectedText(String str) } /** - * Returns true if overwrite mode is enabled, false otherwise. + * @return true if overwrite mode is enabled, false otherwise. */ public final boolean isOverwriteEnabled() { @@ -1428,7 +1435,7 @@ public final void setOverwriteEnabled(boolean overwrite) } /** - * Returns true if the selection is rectangular, false otherwise. + * @return true if the selection is rectangular, false otherwise. */ public final boolean isSelectionRectangular() { @@ -1447,7 +1454,7 @@ public final void setSelectionRectangular(boolean rectSelect) } /** - * Returns the position of the highlighted bracket (the bracket + * @return the position of the highlighted bracket (the bracket * matching the one before the caret) */ public final int getBracketPosition() @@ -1456,7 +1463,7 @@ public final int getBracketPosition() } /** - * Returns the line of the highlighted bracket (the bracket + * @return the line of the highlighted bracket (the bracket * matching the one before the caret) */ public final int getBracketLine() diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/KeywordMap.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/KeywordMap.java index 57e026d6..b75ce4b1 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/KeywordMap.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/KeywordMap.java @@ -50,6 +50,7 @@ public KeywordMap(boolean ignoreCase, int mapLength) * @param text The text segment * @param offset The offset of the substring within the text segment * @param length The length of the substring + * @return the key */ public byte lookup(Segment text, int offset, int length) { @@ -83,7 +84,7 @@ public void add(String keyword, byte id) } /** - * Returns true if the keyword map is set to be case insensitive, + * @return true if the keyword map is set to be case insensitive, * false otherwise. */ public boolean getIgnoreCase() diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxDocument.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxDocument.java index 2e725a1f..9a145036 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxDocument.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxDocument.java @@ -26,7 +26,7 @@ public class SyntaxDocument extends PlainDocument { /** - * Returns the token marker that is to be used to split lines + * @return the token marker that is to be used to split lines * of this document up into tokens. May return null if this * document is not to be colorized. */ diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxStyle.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxStyle.java index ad91ab95..9dc8a9a4 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxStyle.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxStyle.java @@ -36,7 +36,7 @@ public SyntaxStyle(Color color, boolean italic, boolean bold) } /** - * Returns the color specified in this style. + * @return the color specified in this style. */ public Color getColor() { @@ -44,7 +44,7 @@ public Color getColor() } /** - * Returns true if no font styles are enabled. + * @return true if no font styles are enabled. */ public boolean isPlain() { @@ -52,7 +52,7 @@ public boolean isPlain() } /** - * Returns true if italics is enabled for this style. + * @return true if italics is enabled for this style. */ public boolean isItalic() { @@ -60,7 +60,7 @@ public boolean isItalic() } /** - * Returns true if boldface is enabled for this style. + * @return true if boldface is enabled for this style. */ public boolean isBold() { @@ -68,8 +68,9 @@ public boolean isBold() } /** - * Returns the specified font, but with the style's bold and + * @return the specified font, but with the style's bold and * italic flags applied. + * @param font The unperturbed font */ public Font getStyledFont(Font font) { @@ -87,7 +88,8 @@ public Font getStyledFont(Font font) } /** - * Returns the font metrics for the styled font. + * @return the font metrics for the styled font. + * @param font The font for which the metrics are obtained. */ @SuppressWarnings("deprecation") public FontMetrics getFontMetrics(Font font) @@ -121,7 +123,7 @@ public void setGraphicsFlags(Graphics gfx, Font font) } /** - * Returns a string representation of this object. + * @return a string representation of this object. */ public String toString() { diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxUtilities.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxUtilities.java index 23bd9936..e9ca2c48 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxUtilities.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/SyntaxUtilities.java @@ -32,6 +32,7 @@ public class SyntaxUtilities * @param text The segment * @param offset The offset into the segment * @param match The string to match + * @return true if they match */ public static boolean regionMatches(boolean ignoreCase, Segment text, int offset, String match) @@ -62,6 +63,7 @@ public static boolean regionMatches(boolean ignoreCase, Segment text, * @param text The segment * @param offset The offset into the segment * @param match The character array to match + * @return true if they match */ public static boolean regionMatches(boolean ignoreCase, Segment text, int offset, char[] match) @@ -86,7 +88,7 @@ public static boolean regionMatches(boolean ignoreCase, Segment text, } /** - * Returns the default style table. This can be passed to the + * @return the default style table. This can be passed to the * setStyles() method of SyntaxDocument * to use the default syntax styles. */ diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaDefaults.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaDefaults.java index c793e6ff..160415df 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaDefaults.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaDefaults.java @@ -47,7 +47,7 @@ public class TextAreaDefaults public JPopupMenu popup; /** - * Returns a new TextAreaDefaults object with the default values filled + * @return a new TextAreaDefaults object with the default values filled * in. */ public static TextAreaDefaults getDefaults() diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaPainter.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaPainter.java index d20d5ad9..9665da15 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaPainter.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextAreaPainter.java @@ -38,6 +38,8 @@ public class TextAreaPainter extends JComponent implements TabExpander /** * Creates a new repaint manager. This should be not be called * directly. + * @param textArea The area of interest + * @param defaults TODO */ /*static BufferedImage backgroundImage; static { @@ -82,7 +84,7 @@ public TextAreaPainter(JEditTextArea textArea, TextAreaDefaults defaults) } /** - * Returns if this component can be traversed by pressing the + * @return if this component can be traversed by pressing the * Tab key. This returns false. */ public final boolean isManagingFocus() @@ -91,7 +93,7 @@ public final boolean isManagingFocus() } /** - * Returns the syntax styles used to paint colorized text. Entry n + * @return the syntax styles used to paint colorized text. Entry n * will be used to paint tokens with id = n. * @see Token */ @@ -113,7 +115,7 @@ public final void setStyles(SyntaxStyle[] styles) } /** - * Returns the caret color. + * @return the caret color. */ public final Color getCaretColor() { @@ -131,7 +133,7 @@ public final void setCaretColor(Color caretColor) } /** - * Returns the selection color. + * @return the selection color. */ public final Color getSelectionColor() { @@ -149,7 +151,7 @@ public final void setSelectionColor(Color selectionColor) } /** - * Returns the line highlight color. + * @return the line highlight color. */ public final Color getLineHighlightColor() { @@ -167,7 +169,7 @@ public final void setLineHighlightColor(Color lineHighlightColor) } /** - * Returns true if line highlight is enabled, false otherwise. + * @return true if line highlight is enabled, false otherwise. */ public final boolean isLineHighlightEnabled() { @@ -186,7 +188,7 @@ public final void setLineHighlightEnabled(boolean lineHighlight) } /** - * Returns the bracket highlight color. + * @return the bracket highlight color. */ public final Color getBracketHighlightColor() { @@ -204,7 +206,7 @@ public final void setBracketHighlightColor(Color bracketHighlightColor) } /** - * Returns true if bracket highlighting is enabled, false otherwise. + * @return true if bracket highlighting is enabled, false otherwise. * When bracket highlighting is enabled, the bracket matching the * one before the caret (if any) is highlighted. */ @@ -227,7 +229,7 @@ public final void setBracketHighlightEnabled(boolean bracketHighlight) } /** - * Returns true if the caret should be drawn as a block, false otherwise. + * @return true if the caret should be drawn as a block, false otherwise. */ public final boolean isBlockCaretEnabled() { @@ -246,7 +248,7 @@ public final void setBlockCaretEnabled(boolean blockCaret) } /** - * Returns the EOL marker color. + * @return the EOL marker color. */ public final Color getEOLMarkerColor() { @@ -264,7 +266,7 @@ public final void setEOLMarkerColor(Color eolMarkerColor) } /** - * Returns true if EOL markers are drawn, false otherwise. + * @return true if EOL markers are drawn, false otherwise. */ public final boolean getEOLMarkersPainted() { @@ -282,7 +284,7 @@ public final void setEOLMarkersPainted(boolean eolMarkers) } /** - * Returns true if invalid lines are painted as red tildes (~), + * @return true if invalid lines are painted as red tildes (~), * false otherwise. */ public boolean getInvalidLinesPainted() @@ -331,7 +333,7 @@ public interface Highlight void paintHighlight(Graphics gfx, int line, int y); /** - * Returns the tool tip to display at the specified + * @return the tool tip to display at the specified * location. If this highlighter doesn't know what to * display, it should delegate to the next highlight * painter. @@ -341,7 +343,7 @@ public interface Highlight } /** - * Returns the tool tip to display at the specified location. + * @return the tool tip to display at the specified location. * @param evt The mouse event */ public String getToolTipText(MouseEvent evt) @@ -353,7 +355,7 @@ public String getToolTipText(MouseEvent evt) } /** - * Returns the font metrics used by this component. + * @return the font metrics used by this component. */ public FontMetrics getFontMetrics() { @@ -470,7 +472,7 @@ public float nextTabStop(float x, int tabOffset) } /** - * Returns the painter's preferred size. + * @return the painter's preferred size. */ public Dimension getPreferredSize() { @@ -482,7 +484,7 @@ public Dimension getPreferredSize() /** - * Returns the painter's minimum size. + * @return the painter's minimum size. */ public Dimension getMinimumSize() { diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextUtilities.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextUtilities.java index b2f54858..36bdc6a6 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextUtilities.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TextUtilities.java @@ -19,7 +19,7 @@ public class TextUtilities { /** - * Returns the offset of the bracket matching the one at the + * @return the offset of the bracket matching the one at the * specified offset of the document, or -1 if the bracket is * unmatched (or if the character is not a bracket). * @param doc The document @@ -129,6 +129,8 @@ else if(x == cprime) * Locates the start of the word at the specified position. * @param line The text * @param pos The position + * @param noWordSep The word separator + * @return the position of the start of the word */ public static int findWordStart(String line, int pos, String noWordSep) { @@ -158,6 +160,8 @@ public static int findWordStart(String line, int pos, String noWordSep) * Locates the end of the word at the specified position. * @param line The text * @param pos The position + * @param noWordSep The word separator + * @return the position of the end of the word */ public static int findWordEnd(String line, int pos, String noWordSep) { diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TokenMarker.java b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TokenMarker.java index 82202e1d..07403ed2 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TokenMarker.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/syntaxcoloring/TokenMarker.java @@ -31,6 +31,7 @@ public abstract class TokenMarker * that is called to split a line up into tokens. * @param line The line * @param lineIndex The line number + * @return the token at the indicated position */ public Token markTokens(Segment line, int lineIndex) { @@ -124,7 +125,7 @@ protected abstract byte markTokensImpl(byte token, Segment line, int lineIndex); /** - * Returns if the token marker supports tokens that span multiple + * @return if the token marker supports tokens that span multiple * lines. If this is true, the object using this token marker is * required to pass all lines in the document to the * markTokens() method (in turn).

@@ -178,7 +179,7 @@ public void deleteLines(int index, int lines) } /** - * Returns the number of lines in this token marker. + * @return the number of lines in this token marker. */ public int getLineCount() { @@ -186,7 +187,7 @@ public int getLineCount() } /** - * Returns true if the next line should be repainted. This + * @return true if the next line should be repainted. This * will return true after a line has been tokenized that starts * a multiline token that continues onto the next line. */ @@ -319,6 +320,8 @@ public LineInfo() /** * Creates a new LineInfo object with the specified * parameters. + * @param token TODO + * @param obj TODO */ public LineInfo(byte token, Object obj) { diff --git a/ochafik-util/.classpath b/ochafik-util/.classpath index 4cf68d6b..9bef8d6b 100644 --- a/ochafik-util/.classpath +++ b/ochafik-util/.classpath @@ -1,9 +1,46 @@ - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ochafik-util/.project b/ochafik-util/.project index dfb06a00..d06efce3 100644 --- a/ochafik-util/.project +++ b/ochafik-util/.project @@ -20,8 +20,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature org.eclipse.iam.jdt.core.mavenNature org.eclipse.jdt.core.javanature diff --git a/ochafik-util/.settings/org.eclipse.jdt.core.prefs b/ochafik-util/.settings/org.eclipse.jdt.core.prefs index b3c33f6c..cf4d3d81 100644 --- a/ochafik-util/.settings/org.eclipse.jdt.core.prefs +++ b/ochafik-util/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,7 @@ -#Thu Jan 28 23:48:05 CET 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/ochafik-util/ochafik-util.iml b/ochafik-util/ochafik-util.iml new file mode 100644 index 00000000..25ae030c --- /dev/null +++ b/ochafik-util/ochafik-util.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ochafik-util/src/main/java/com/ochafik/lang/Threads.java b/ochafik-util/src/main/java/com/ochafik/lang/Threads.java index 27dcffab..919bea11 100644 --- a/ochafik-util/src/main/java/com/ochafik/lang/Threads.java +++ b/ochafik-util/src/main/java/com/ochafik/lang/Threads.java @@ -76,6 +76,7 @@ public void run() { /** * Add a task that is to be executed in its own thread. * @param runnable task to be executed in its own thread + * @param the specialization for Runnable * @return the runnable argument unchanged */ public synchronized T add(T runnable) { @@ -162,7 +163,7 @@ public synchronized State getState() { /** * Adds a listener that will be notified upon completion of all of the running threads. * Its actionPerformed method will be called immediately if the threads already finished. - * @param actionListener + * @param actionListener the listener that will be notified */ public synchronized void addActionListener(ActionListener actionListener) { if (actionListeners == null) diff --git a/pom.xml b/pom.xml index a07c6837..f5d6c618 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ jnaerator-rococoa-runtime jnaerator-parser - maven-jnaerator-plugin + jnaerator-maven-plugin jnaerator @@ -107,7 +107,7 @@ com.nativelibs4java - maven-jnaerator-plugin + jnaerator-maven-plugin ${project.version} From 83b616fe78b923c1ad7e4ca75648eedd5c25e52d Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Thu, 16 Aug 2018 14:39:21 -0500 Subject: [PATCH 02/10] Update README.md (#1) Changed the Wiki link to point to the GitHub Wiki. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fa67f80..b85056ae 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [JNAerator](http://jnaerator.googlecode.com) generates complete native bindings for C, C++ and Objective-C libraries, targetting [BridJ](http://github.com/ochafik/BridJ), [JNA](https://github.com/twall/jna) or [node.js](http://nodejs.org) runtimes. -A comprehensive documentation is available on its [Wiki](https://code.google.com/p/jnaerator/wiki/Documentation?tm=6). +A comprehensive documentation is available on its [Wiki](https://github.com/nativelibs4java/JNAerator/wiki). It was previously hosted on [ochafik/nativelibs4java](http://github.com/ochafik/nativelibs4java). From 6a9101a12864545bf6ff98bf56016cd4863f1a6d Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Thu, 16 Aug 2018 19:19:59 -0500 Subject: [PATCH 03/10] all tests pass, some fatal errors remain --- ..._org_apiguardian_apiguardian_api_1_0_0.xml | 13 ++++++ ..._junit_jupiter_junit_jupiter_api_5_2_0.xml | 13 ++++++ ...nit_jupiter_junit_jupiter_engine_5_2_0.xml | 13 ++++++ ..._platform_junit_platform_commons_1_2_0.xml | 13 ++++++ ...t_platform_junit_platform_engine_1_2_0.xml | 13 ++++++ ...nit_vintage_junit_vintage_engine_5_2_0.xml | 13 ++++++ ...Maven__org_opentest4j_opentest4j_1_1_0.xml | 13 ++++++ .../jnearator-maven-plugin.iml | 18 +++++++- jnaerator-parent.iml | 7 ++++ jnaerator-parser/jnaerator-parser.iml | 7 ++++ .../jnaerator-rococoa-runtime.iml | 7 ++++ jnaerator-runtime/jnaerator-runtime.iml | 7 ++++ jnaerator/jnaerator.iml | 7 ++++ jnaerator/pom.xml | 2 +- .../ochafik/lang/compiler/CompilerUtils.java | 42 +++++++++---------- .../com/ochafik/lang/jnaerator/JNAerator.java | 3 +- ochafik-swing/ochafik-swing.iml | 7 ++++ ochafik-util/ochafik-util.iml | 7 ++++ pom.xml | 12 ++++-- 19 files changed, 187 insertions(+), 30 deletions(-) create mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_2_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_2_0.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_2_0.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_2_0.xml create mode 100644 .idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_2_0.xml create mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_1_0.xml diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml new file mode 100644 index 00000000..a82457d5 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_2_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_2_0.xml new file mode 100644 index 00000000..3c2d85c2 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_2_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_2_0.xml new file mode 100644 index 00000000..614200c2 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_2_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_2_0.xml new file mode 100644 index 00000000..92d6f708 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_2_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_2_0.xml new file mode 100644 index 00000000..5b2606a8 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_2_0.xml b/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_2_0.xml new file mode 100644 index 00000000..6603b712 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_1_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_1_0.xml new file mode 100644 index 00000000..79af13d9 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jnaerator-maven-plugin/jnearator-maven-plugin.iml b/jnaerator-maven-plugin/jnearator-maven-plugin.iml index f53ad4ac..2e16da7d 100644 --- a/jnaerator-maven-plugin/jnearator-maven-plugin.iml +++ b/jnaerator-maven-plugin/jnearator-maven-plugin.iml @@ -9,6 +9,13 @@ + + + + + + + @@ -53,7 +60,14 @@ - - + + + + + + + + + \ No newline at end of file diff --git a/jnaerator-parent.iml b/jnaerator-parent.iml index a058f93d..7c924fb8 100644 --- a/jnaerator-parent.iml +++ b/jnaerator-parent.iml @@ -8,6 +8,13 @@ + + + + + + + diff --git a/jnaerator-parser/jnaerator-parser.iml b/jnaerator-parser/jnaerator-parser.iml index 1b6c5fc1..0354c5b2 100644 --- a/jnaerator-parser/jnaerator-parser.iml +++ b/jnaerator-parser/jnaerator-parser.iml @@ -17,6 +17,13 @@ + + + + + + + diff --git a/jnaerator-rococoa-runtime/jnaerator-rococoa-runtime.iml b/jnaerator-rococoa-runtime/jnaerator-rococoa-runtime.iml index 635d7503..6fc9fff0 100644 --- a/jnaerator-rococoa-runtime/jnaerator-rococoa-runtime.iml +++ b/jnaerator-rococoa-runtime/jnaerator-rococoa-runtime.iml @@ -17,6 +17,13 @@ + + + + + + + diff --git a/jnaerator-runtime/jnaerator-runtime.iml b/jnaerator-runtime/jnaerator-runtime.iml index ab6174ed..c5dcf094 100644 --- a/jnaerator-runtime/jnaerator-runtime.iml +++ b/jnaerator-runtime/jnaerator-runtime.iml @@ -14,6 +14,13 @@ + + + + + + + diff --git a/jnaerator/jnaerator.iml b/jnaerator/jnaerator.iml index 0f622e6c..aad354fc 100644 --- a/jnaerator/jnaerator.iml +++ b/jnaerator/jnaerator.iml @@ -31,6 +31,13 @@ + + + + + + + diff --git a/jnaerator/pom.xml b/jnaerator/pom.xml index 5ed30c1b..9116bb81 100644 --- a/jnaerator/pom.xml +++ b/jnaerator/pom.xml @@ -104,7 +104,7 @@ Users who are looking for ready-to-use libraries should check the NativeLibs4Jav org.apache.maven.plugins maven-surefire-plugin - true + false diff --git a/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java b/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java index 8a580dee..443118a0 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java +++ b/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java @@ -19,6 +19,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/). package com.ochafik.lang.compiler; import java.util.*; +import java.util.regex.Matcher; import java.util.regex.Pattern; import java.io.*; import java.net.MalformedURLException; @@ -88,35 +89,26 @@ public String adapt(String[] value) { public static String getClassPath(Class c, File cacheDirectory) throws MalformedURLException, IOException { - URL resource = c.getResource(c.getSimpleName() + ".class"); + final URL resource = c.getResource(c.getSimpleName() + ".class"); if (resource != null) { - String resstr = resource.toString(); -// if (resstr.contains("Prog/")) -// resstr = "jar:http://ochafik.com/Java/jnaerator.jar!/..."; - + final String resstr = resource.toString(); + String newstr = resstr; if (resstr.matches("jar:.*!.*")) { - resstr = resstr.substring("jar:".length(), resstr.indexOf("!")); + newstr = resstr.substring("jar:".length(), resstr.indexOf("!")); + } else if (resstr.matches( "jrt:/[^/]*.*")) { + // final Pattern pattern = Pattern.compile("jrt:/(?[^/]*)(?.*)"); + // final Matcher matcher = pattern.matcher(resstr); + // matcher.find(); + // newstr = matcher.group("path"); } else { String p = '/' + c.getName().replace('.', '/') + ".class"; if (resstr.endsWith(p)) { - resstr = resstr.substring(0, resstr.length() - p.length()); + newstr = resstr.substring(0, resstr.length() - p.length()); } } - return getLocalFile(new URL(resstr), cacheDirectory).toString(); + // System.out.println("class path : " + resstr + ", new : " + newstr); + return getLocalFile(new URL(newstr), cacheDirectory).toString(); } - /* - if (resource != null) { - String resstr = resource.toString(); - if (resstr.matches("jar:file:.*!.*")) - return resstr.substring("jar:file:".length(), resstr.indexOf("!")); - else if (resstr.matches("jar:http:.*!.*")) - return resstr.substring("jar:".length(), resstr.indexOf("!")); - else { - String p = '/' + c.getName().replace('.', '/') + ".class"; - if (resstr.endsWith(p)) - return resstr.substring(0, resstr.length() - p.length()); - } - }*/ return null; } @@ -133,7 +125,7 @@ public static Set getClassPaths(File cacheDirectory, Class... cs) thr } static Map localURLCaches = new LinkedHashMap(); - static File getLocalFile(URL remoteFile, File cacheDirectory) throws IOException { + static File getLocalFile(final URL remoteFile, final File cacheDirectory) throws IOException { if ("file".equals(remoteFile.getProtocol())) { return new File(URLDecoder.decode(remoteFile.getFile(), "utf-8")); } @@ -181,7 +173,11 @@ static File getLocalFile(URL remoteFile, File cacheDirectory) throws IOException return f; } - public static void compile(JavaCompiler compiler, MemoryFileManager fileManager, DiagnosticCollector diagnostics, String sourceCompatibility, File cacheDirectory, Class... classpathHints) throws MalformedURLException, IOException { + public static void compile(JavaCompiler compiler, MemoryFileManager fileManager, + DiagnosticCollector diagnostics, + String sourceCompatibility, File cacheDirectory, + Class... classpathHints) + throws MalformedURLException, IOException { //JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); //System.out.println("compiler = " + (compiler == null ? "" : compiler.getClass().getName())); String bootclasspath = StringUtils.implode(getClassPaths(cacheDirectory, String.class), File.pathSeparator); diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java index 137d18c1..f023a762 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java @@ -1018,7 +1018,8 @@ public PrintWriter getSourceWriter(String path) throws IOException { javaCompilerMemoryFileManager.addSourceInput(cnAndSrc.getKey(), cnAndSrc.getValue()); } feedback.setStatus("Compiling JNAerated files..."); - CompilerUtils.compile(javaCompiler, javaCompilerMemoryFileManager, diagnostics, "1.5", config.cacheDir, config.runtime.libraryClass, + CompilerUtils.compile(javaCompiler, javaCompilerMemoryFileManager, diagnostics, + "1.6", config.cacheDir, config.runtime.libraryClass, JNAerator.class, NSClass.class, Rococoa.class, Mangling.class, BridJ.class); CompilerUtils.CompilationError.throwErrors(diagnostics.getDiagnostics(), javaCompilerMemoryFileManager.inputs, javaCompiler.getClass().getName()); diff --git a/ochafik-swing/ochafik-swing.iml b/ochafik-swing/ochafik-swing.iml index 0caada81..5aba98e3 100644 --- a/ochafik-swing/ochafik-swing.iml +++ b/ochafik-swing/ochafik-swing.iml @@ -11,6 +11,13 @@ + + + + + + + diff --git a/ochafik-util/ochafik-util.iml b/ochafik-util/ochafik-util.iml index 25ae030c..c78fba5f 100644 --- a/ochafik-util/ochafik-util.iml +++ b/ochafik-util/ochafik-util.iml @@ -10,6 +10,13 @@ + + + + + + + diff --git a/pom.xml b/pom.xml index f5d6c618..c3bdc4b9 100644 --- a/pom.xml +++ b/pom.xml @@ -44,9 +44,15 @@ - junit - junit - 4.12 + org.junit.jupiter + junit-jupiter-engine + 5.2.0 + test + + + org.junit.vintage + junit-vintage-engine + 5.2.0 test From 3a75f48d46a15c2138146ba72baf520f2a9d9013 Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Fri, 17 Aug 2018 10:31:13 -0500 Subject: [PATCH 04/10] update http link from http://jnaerator.googlecode.com/ to https://github.com/nativelibs4java/JNAerator --- .idea/ClojureProjectResolveSettings.xml | 6 ++++++ LICENSE.LGPL.header | 2 +- .../org/anarres/cpp/DeferredFileReader.java | 2 +- .../jnearator-maven-plugin.iml | 20 +++++++++---------- .../lang/jnaerator/parser/ObjCDemangling.g | 6 +++--- .../ochafik/lang/jnaerator/parser/ObjCpp.g | 6 +++--- .../lang/jnaerator/parser/XCodeProject.g | 6 +++--- .../lang/jnaerator/parser/Annotation.java | 2 +- .../ochafik/lang/jnaerator/parser/Arg.java | 2 +- .../lang/jnaerator/parser/Declaration.java | 2 +- .../lang/jnaerator/parser/Declarations.java | 2 +- .../jnaerator/parser/DeclarationsHolder.java | 2 +- .../lang/jnaerator/parser/Declarator.java | 2 +- .../ochafik/lang/jnaerator/parser/Define.java | 2 +- .../lang/jnaerator/parser/Element.java | 2 +- .../jnaerator/parser/EmptyDeclaration.java | 2 +- .../ochafik/lang/jnaerator/parser/Enum.java | 2 +- .../lang/jnaerator/parser/Expression.java | 2 +- .../jnaerator/parser/FriendDeclaration.java | 2 +- .../lang/jnaerator/parser/Function.java | 2 +- .../parser/FunctionPointerDeclaration.java | 2 +- .../lang/jnaerator/parser/Include.java | 2 +- .../jnaerator/parser/ModifiableElement.java | 2 +- .../lang/jnaerator/parser/Modifier.java | 2 +- .../lang/jnaerator/parser/ModifierType.java | 2 +- .../lang/jnaerator/parser/Namespace.java | 2 +- .../lang/jnaerator/parser/PrintScanner.java | 2 +- .../lang/jnaerator/parser/Scanner.java | 2 +- .../parser/SemiUnmodifiableList.java | 2 +- .../lang/jnaerator/parser/SourceFile.java | 2 +- .../lang/jnaerator/parser/Statement.java | 2 +- .../jnaerator/parser/StoredDeclarations.java | 2 +- .../ochafik/lang/jnaerator/parser/Struct.java | 2 +- .../parser/TaggedTypeRefDeclaration.java | 2 +- .../lang/jnaerator/parser/TypeMutator.java | 2 +- .../lang/jnaerator/parser/TypeRef.java | 2 +- .../lang/jnaerator/parser/ValuedModifier.java | 2 +- .../parser/VariablesDeclaration.java | 2 +- .../lang/jnaerator/parser/Visitor.java | 2 +- .../lang/jnaerator/parser/ExpressionTest.java | 2 +- .../jnaerator/parser/ObjCppElementsTest.java | 2 +- .../runtime/globals/GlobalCGFloat.java | 2 +- .../lang/jnaerator/runtime/FastCall.java | 2 +- .../jnaerator/runtime/JNAeratorRuntime.java | 2 +- .../jnaerator/runtime/LibraryExtractor.java | 2 +- .../runtime/MangledFunctionMapper.java | 2 +- .../lang/jnaerator/runtime/Mangling.java | 2 +- .../lang/jnaerator/runtime/StringPointer.java | 2 +- .../lang/jnaerator/runtime/Structure.java | 2 +- .../lang/jnaerator/runtime/ThisCall.java | 2 +- .../ochafik/lang/jnaerator/runtime/Union.java | 2 +- .../runtime/VirtualTablePointer.java | 2 +- .../jnaerator/runtime/WStringPointer.java | 2 +- .../jnaerator/runtime/globals/Global.java | 2 +- .../jnaerator/runtime/globals/GlobalByte.java | 2 +- .../runtime/globals/GlobalCallback.java | 2 +- .../jnaerator/runtime/globals/GlobalChar.java | 2 +- .../runtime/globals/GlobalDouble.java | 2 +- .../runtime/globals/GlobalFloat.java | 2 +- .../jnaerator/runtime/globals/GlobalInt.java | 2 +- .../jnaerator/runtime/globals/GlobalLong.java | 2 +- .../runtime/globals/GlobalNativeLong.java | 2 +- .../runtime/globals/GlobalNativeSize.java | 2 +- .../runtime/globals/GlobalPointer.java | 2 +- .../runtime/globals/GlobalPointerType.java | 2 +- .../runtime/globals/GlobalPrimitive.java | 2 +- .../runtime/globals/GlobalShort.java | 2 +- .../runtime/globals/GlobalStruct.java | 2 +- .../lang/jnaerator/runtime/StructureTest.java | 2 +- .../admin/visualstudio/Configuration.java | 2 +- .../admin/visualstudio/FileConfiguration.java | 2 +- .../ochafik/admin/visualstudio/Project.java | 2 +- .../ochafik/admin/visualstudio/Solution.java | 2 +- ...VisualStudioSolutionAndProjectsParser.java | 2 +- .../admin/visualstudio/VisualStudioUtils.java | 2 +- .../ochafik/lang/compiler/CompilerUtils.java | 2 +- .../lang/compiler/MemoryFileManager.java | 2 +- .../lang/compiler/MemoryFileObject.java | 2 +- .../ochafik/lang/compiler/MemoryJavaFile.java | 2 +- .../lang/grammar/DummyDebugEventListener.java | 2 +- .../com/ochafik/lang/jnaerator/Analysis.java | 2 +- .../jnaerator/BridJDeclarationsConverter.java | 2 +- .../com/ochafik/lang/jnaerator/BridJer.java | 2 +- .../lang/jnaerator/BridgeSupportParser.java | 2 +- .../lang/jnaerator/CPlusPlusAccess.java | 2 +- .../lang/jnaerator/CToJavaPreScanner.java | 2 +- .../lang/jnaerator/ClassOutputter.java | 2 +- .../lang/jnaerator/DeclarationsConverter.java | 6 +++--- .../lang/jnaerator/GlobalsGenerator.java | 2 +- .../jnaerator/JNADeclarationsConverter.java | 2 +- .../com/ochafik/lang/jnaerator/JNAerator.java | 2 +- .../lang/jnaerator/JNAeratorConfig.java | 2 +- .../lang/jnaerator/JNAeratorConfigUtils.java | 2 +- .../lang/jnaerator/JNAeratorParser.java | 2 +- .../lang/jnaerator/JNAeratorUtils.java | 2 +- .../lang/jnaerator/MissingNamesChooser.java | 2 +- .../NodeJSDeclarationsConverter.java | 2 +- .../lang/jnaerator/ObjectiveCGenerator.java | 2 +- .../jnaerator/ObjectiveCToJavaPreScanner.java | 2 +- .../lang/jnaerator/PreprocessorUtils.java | 2 +- .../com/ochafik/lang/jnaerator/Result.java | 4 ++-- .../ochafik/lang/jnaerator/RococoaUtils.java | 2 +- .../ochafik/lang/jnaerator/Signatures.java | 2 +- .../com/ochafik/lang/jnaerator/SimpleGUI.java | 2 +- .../ochafik/lang/jnaerator/SourceFiles.java | 2 +- .../com/ochafik/lang/jnaerator/Symbols.java | 2 +- .../lang/jnaerator/TypeConversion.java | 2 +- .../UnsupportedConversionException.java | 2 +- .../lang/jnaerator/studio/AbstractNode.java | 2 +- .../jnaerator/studio/ElementListNode.java | 2 +- .../lang/jnaerator/studio/ElementNode.java | 2 +- .../jnaerator/studio/JNAeratorStudio.java | 2 +- .../lang/jnaerator/studio/ResultContent.java | 2 +- .../lang/jnaerator/JNAerationTest.java | 2 +- .../lang/jnaerator/JNAeratorConfigTest.java | 2 +- .../ochafik/lang/jnaerator/JNAeratorTest.java | 2 +- .../lang/jnaerator/SystemHeadersTest.java | 4 ++-- .../jnaerator/parser/ObjCppParsingTest.java | 2 +- .../lang/jnaerator/parser/ObjCppTest.mm | 2 +- .../com/ochafik/beans/BeansController.java | 2 +- .../java/com/ochafik/swing/FormElement.java | 2 +- .../java/com/ochafik/swing/FormUtils.java | 2 +- .../java/com/ochafik/swing/UndoRedoUtils.java | 2 +- .../java/com/ochafik/beans/BeansUtils.java | 2 +- .../java/com/ochafik/io/FileListUtils.java | 2 +- .../src/main/java/com/ochafik/io/IOUtils.java | 2 +- .../main/java/com/ochafik/io/ReadText.java | 2 +- .../ochafik/io/StringBufferOutputStream.java | 2 +- .../main/java/com/ochafik/io/WriteText.java | 2 +- .../junit/ParameterizedWithDescription.java | 2 +- .../java/com/ochafik/lang/AssertUtils.java | 2 +- .../java/com/ochafik/lang/SyntaxUtils.java | 2 +- .../main/java/com/ochafik/lang/Threads.java | 2 +- .../com/ochafik/lang/reflect/DebugUtils.java | 2 +- .../lang/reflect/GettersAndSettersHelper.java | 2 +- .../java/com/ochafik/util/SystemUtils.java | 2 +- .../com/ochafik/util/string/RegexUtils.java | 2 +- .../com/ochafik/util/string/StringUtils.java | 2 +- .../main/java/com/ochafik/xml/XMLUtils.java | 2 +- .../main/java/com/ochafik/xml/XPathUtils.java | 2 +- resources/JNAeratorStudio.jnlp | 2 +- webstart/JNAeratorStudio.jnlp | 2 +- 142 files changed, 166 insertions(+), 160 deletions(-) create mode 100644 .idea/ClojureProjectResolveSettings.xml diff --git a/.idea/ClojureProjectResolveSettings.xml b/.idea/ClojureProjectResolveSettings.xml new file mode 100644 index 00000000..df470b16 --- /dev/null +++ b/.idea/ClojureProjectResolveSettings.xml @@ -0,0 +1,6 @@ + + + + IDE + + \ No newline at end of file diff --git a/LICENSE.LGPL.header b/LICENSE.LGPL.header index a29a0bee..d0be807e 100644 --- a/LICENSE.LGPL.header +++ b/LICENSE.LGPL.header @@ -1,7 +1,7 @@ /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/anarres/src/main/java/org/anarres/cpp/DeferredFileReader.java b/anarres/src/main/java/org/anarres/cpp/DeferredFileReader.java index 0fb90ec2..5796ee00 100644 --- a/anarres/src/main/java/org/anarres/cpp/DeferredFileReader.java +++ b/anarres/src/main/java/org/anarres/cpp/DeferredFileReader.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator-maven-plugin/jnearator-maven-plugin.iml b/jnaerator-maven-plugin/jnearator-maven-plugin.iml index 2e16da7d..424af87c 100644 --- a/jnaerator-maven-plugin/jnearator-maven-plugin.iml +++ b/jnaerator-maven-plugin/jnearator-maven-plugin.iml @@ -9,19 +9,19 @@ + + + + + + + + - - - - - - - - @@ -29,9 +29,9 @@ - + - + diff --git a/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCDemangling.g b/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCDemangling.g index 24bc40b7..4e381988 100644 --- a/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCDemangling.g +++ b/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCDemangling.g @@ -1,7 +1,7 @@ /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -37,7 +37,7 @@ options { /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -107,7 +107,7 @@ import static com.ochafik.lang.jnaerator.parser.StoredDeclarations.*; /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCpp.g b/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCpp.g index 28d94db2..3d49e4f2 100644 --- a/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCpp.g +++ b/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCpp.g @@ -1,7 +1,7 @@ /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -48,7 +48,7 @@ scope ModContext { /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -440,7 +440,7 @@ import static com.ochafik.lang.jnaerator.parser.StoredDeclarations.*; /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/XCodeProject.g b/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/XCodeProject.g index ac2b9f84..a70d3bf1 100644 --- a/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/XCodeProject.g +++ b/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/XCodeProject.g @@ -1,7 +1,7 @@ /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -35,7 +35,7 @@ options { /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -67,7 +67,7 @@ import java.util.ArrayList; /* Copyright (c) 2009 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Annotation.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Annotation.java index 1629eae9..cbacd39b 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Annotation.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Annotation.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Arg.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Arg.java index 4405afcb..37e5b45f 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Arg.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Arg.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declaration.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declaration.java index 0b3dbf52..3d650106 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declaration.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declaration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarations.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarations.java index 8daf97e2..058ccd07 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarations.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarations.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/DeclarationsHolder.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/DeclarationsHolder.java index 19821d3f..17e37e98 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/DeclarationsHolder.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/DeclarationsHolder.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarator.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarator.java index 665c2d3a..96a119ee 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarator.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Declarator.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Define.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Define.java index 25c209bf..94c50ff2 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Define.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Define.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Element.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Element.java index 8b087960..87266ba6 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Element.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Element.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/EmptyDeclaration.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/EmptyDeclaration.java index 4565681c..3d90cf4e 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/EmptyDeclaration.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/EmptyDeclaration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Enum.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Enum.java index a7d673d4..ccd262f9 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Enum.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Enum.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Expression.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Expression.java index 49e0c223..976cfcab 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Expression.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Expression.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FriendDeclaration.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FriendDeclaration.java index 67173bd7..c6203812 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FriendDeclaration.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FriendDeclaration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Function.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Function.java index 77c48f31..3bdd1e9f 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Function.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Function.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FunctionPointerDeclaration.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FunctionPointerDeclaration.java index 0d35b961..c161fa98 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FunctionPointerDeclaration.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/FunctionPointerDeclaration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Include.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Include.java index 099ee87e..e4558d99 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Include.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Include.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifiableElement.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifiableElement.java index 4eee21d3..48a80f34 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifiableElement.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifiableElement.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Modifier.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Modifier.java index 6e08a5f0..5d205e54 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Modifier.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Modifier.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifierType.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifierType.java index 3272681a..8f2b583f 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifierType.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ModifierType.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Namespace.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Namespace.java index 4dd012a4..916c660d 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Namespace.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Namespace.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/PrintScanner.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/PrintScanner.java index a074b3f7..c7e58772 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/PrintScanner.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/PrintScanner.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Scanner.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Scanner.java index fc596987..ac54f872 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Scanner.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Scanner.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SemiUnmodifiableList.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SemiUnmodifiableList.java index f1925905..69bb507c 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SemiUnmodifiableList.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SemiUnmodifiableList.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SourceFile.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SourceFile.java index 5a8c2966..87109414 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SourceFile.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/SourceFile.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Statement.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Statement.java index d74f538d..a4a76fa4 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Statement.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Statement.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/StoredDeclarations.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/StoredDeclarations.java index 8c423cb4..49257b19 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/StoredDeclarations.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/StoredDeclarations.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Struct.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Struct.java index 74634961..de557517 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Struct.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Struct.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TaggedTypeRefDeclaration.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TaggedTypeRefDeclaration.java index 91aefbcc..54186a95 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TaggedTypeRefDeclaration.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TaggedTypeRefDeclaration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeMutator.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeMutator.java index 2f3e9b99..f4220bfb 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeMutator.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeMutator.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeRef.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeRef.java index ae85cfea..e1e98587 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeRef.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/TypeRef.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ValuedModifier.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ValuedModifier.java index f107521c..7101793b 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ValuedModifier.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ValuedModifier.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/VariablesDeclaration.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/VariablesDeclaration.java index 89786f29..b9ebc05d 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/VariablesDeclaration.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/VariablesDeclaration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Visitor.java b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Visitor.java index 16639b62..aea0505f 100644 --- a/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Visitor.java +++ b/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/Visitor.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ExpressionTest.java b/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ExpressionTest.java index ca563a2c..c68bb2db 100644 --- a/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ExpressionTest.java +++ b/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ExpressionTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppElementsTest.java b/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppElementsTest.java index 2fc93315..5b69d257 100644 --- a/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppElementsTest.java +++ b/jnaerator-parser/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppElementsTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-rococoa-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCGFloat.java b/jnaerator-rococoa-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCGFloat.java index 9c513ffe..abade889 100644 --- a/jnaerator-rococoa-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCGFloat.java +++ b/jnaerator-rococoa-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCGFloat.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/FastCall.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/FastCall.java index 3a0e38a0..e293af24 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/FastCall.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/FastCall.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/JNAeratorRuntime.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/JNAeratorRuntime.java index 5758dd6c..61143e12 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/JNAeratorRuntime.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/JNAeratorRuntime.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/LibraryExtractor.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/LibraryExtractor.java index 36cc8850..534dc2e1 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/LibraryExtractor.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/LibraryExtractor.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/MangledFunctionMapper.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/MangledFunctionMapper.java index c08fae3f..664cd033 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/MangledFunctionMapper.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/MangledFunctionMapper.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Mangling.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Mangling.java index 63b25e3b..d84a1d1f 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Mangling.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Mangling.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/StringPointer.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/StringPointer.java index 4297aba0..cee17201 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/StringPointer.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/StringPointer.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Structure.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Structure.java index 60e7e294..1e930ab5 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Structure.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Structure.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/ThisCall.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/ThisCall.java index f0211849..18e75279 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/ThisCall.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/ThisCall.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Union.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Union.java index 0bc01846..efe58137 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Union.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/Union.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/VirtualTablePointer.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/VirtualTablePointer.java index 114e2c77..6647e5d2 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/VirtualTablePointer.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/VirtualTablePointer.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/WStringPointer.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/WStringPointer.java index 3a89ca92..e0e0d575 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/WStringPointer.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/WStringPointer.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/Global.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/Global.java index d978d55e..d70abf14 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/Global.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/Global.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalByte.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalByte.java index c6e2fe19..93530ea4 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalByte.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalByte.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCallback.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCallback.java index 8d7c31f5..6fffbbdd 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCallback.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalCallback.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalChar.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalChar.java index ff9898c3..db7fbe90 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalChar.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalChar.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalDouble.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalDouble.java index a8acb92c..21d3d39b 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalDouble.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalDouble.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalFloat.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalFloat.java index f701a8ec..fdc1ab56 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalFloat.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalFloat.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalInt.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalInt.java index b8b3bbc0..f95946b7 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalInt.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalInt.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalLong.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalLong.java index 62c6df17..8430958f 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalLong.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalLong.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeLong.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeLong.java index 34d7106f..93744965 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeLong.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeLong.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeSize.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeSize.java index 5b8d7db6..bc7cdde2 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeSize.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalNativeSize.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointer.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointer.java index a1c2be54..a6f68bf4 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointer.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointer.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointerType.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointerType.java index 59d2620b..3517136e 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointerType.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPointerType.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPrimitive.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPrimitive.java index ee3260a4..abd91a54 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPrimitive.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalPrimitive.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalShort.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalShort.java index 34798fd8..87cc101f 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalShort.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalShort.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalStruct.java b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalStruct.java index bf1f3b7f..8fb1867e 100644 --- a/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalStruct.java +++ b/jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/globals/GlobalStruct.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator-runtime/src/test/java/com/ochafik/lang/jnaerator/runtime/StructureTest.java b/jnaerator-runtime/src/test/java/com/ochafik/lang/jnaerator/runtime/StructureTest.java index a6bf2b36..63a2bf28 100644 --- a/jnaerator-runtime/src/test/java/com/ochafik/lang/jnaerator/runtime/StructureTest.java +++ b/jnaerator-runtime/src/test/java/com/ochafik/lang/jnaerator/runtime/StructureTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Configuration.java b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Configuration.java index ed6145c9..c1264919 100644 --- a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Configuration.java +++ b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Configuration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/FileConfiguration.java b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/FileConfiguration.java index 2447d65c..2874ba86 100644 --- a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/FileConfiguration.java +++ b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/FileConfiguration.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Project.java b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Project.java index f27c80d7..0e87ece5 100644 --- a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Project.java +++ b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Project.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Solution.java b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Solution.java index 85afb12f..6783b154 100644 --- a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Solution.java +++ b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/Solution.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioSolutionAndProjectsParser.java b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioSolutionAndProjectsParser.java index a53fa316..388070ad 100644 --- a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioSolutionAndProjectsParser.java +++ b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioSolutionAndProjectsParser.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioUtils.java b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioUtils.java index c7d02af8..7196e0b9 100644 --- a/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioUtils.java +++ b/jnaerator/src/main/java/com/ochafik/admin/visualstudio/VisualStudioUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java b/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java index 443118a0..e4a44098 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java +++ b/jnaerator/src/main/java/com/ochafik/lang/compiler/CompilerUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileManager.java b/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileManager.java index 4b7e8458..c66a174c 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileManager.java +++ b/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileManager.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileObject.java b/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileObject.java index 592357f9..0381e07f 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileObject.java +++ b/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryFileObject.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryJavaFile.java b/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryJavaFile.java index 8e146678..f8d183f5 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryJavaFile.java +++ b/jnaerator/src/main/java/com/ochafik/lang/compiler/MemoryJavaFile.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/grammar/DummyDebugEventListener.java b/jnaerator/src/main/java/com/ochafik/lang/grammar/DummyDebugEventListener.java index 5ad13f61..49b4c329 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/grammar/DummyDebugEventListener.java +++ b/jnaerator/src/main/java/com/ochafik/lang/grammar/DummyDebugEventListener.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Analysis.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Analysis.java index 679240c7..1e1d0038 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Analysis.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Analysis.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJDeclarationsConverter.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJDeclarationsConverter.java index 4640832c..b72d604b 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJDeclarationsConverter.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJDeclarationsConverter.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJer.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJer.java index c0d5a7de..4ce2860a 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJer.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridJer.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridgeSupportParser.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridgeSupportParser.java index 6bdf2d19..9dec20cd 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridgeSupportParser.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/BridgeSupportParser.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CPlusPlusAccess.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CPlusPlusAccess.java index a4812e40..95a8190d 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CPlusPlusAccess.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CPlusPlusAccess.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CToJavaPreScanner.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CToJavaPreScanner.java index 7a250fce..4f2d5e15 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CToJavaPreScanner.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/CToJavaPreScanner.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ClassOutputter.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ClassOutputter.java index f5dd307e..fb8306e0 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ClassOutputter.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ClassOutputter.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/DeclarationsConverter.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/DeclarationsConverter.java index 94bc33f5..2290bb5f 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/DeclarationsConverter.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/DeclarationsConverter.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -976,7 +976,7 @@ protected void writeLibraryInterface(Result result, SourceFiles sourceFiles, Dec interf = result.notifyBeforeWritingClass(fullLibraryClassName, (Struct) interf, signatures, library); if (interf != null) { final PrintWriter out = result.classOutputter.getClassSourceWriter(fullLibraryClassName.toString()); - //out.println("///\n/// This file was autogenerated by JNAerator (http://jnaerator.googlecode.com/), \n/// a tool written by Olivier Chafik (http://ochafik.com/).\n///"); + //out.println("///\n/// This file was autogenerated by JNAerator (https://github.com/nativelibs4java/JNAerator), \n/// a tool written by Olivier Chafik (http://ochafik.com/).\n///"); result.printJavaClass(javaPackage, (Struct) interf, out); out.close(); } @@ -985,7 +985,7 @@ protected void writeLibraryInterface(Result result, SourceFiles sourceFiles, Dec String sourcePath = sourceFile.getElementFile(); assert sourcePath != null; final PrintWriter out = result.classOutputter.getSourceWriter(sourcePath); - //out.println("///\n/// This file was autogenerated by JNAerator (http://jnaerator.googlecode.com/), \n/// a tool written by Olivier Chafik (http://ochafik.com/).\n///"); + //out.println("///\n/// This file was autogenerated by JNAerator (https://github.com/nativelibs4java/JNAerator), \n/// a tool written by Olivier Chafik (http://ochafik.com/).\n///"); out.print(sourceFile); out.close(); } diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/GlobalsGenerator.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/GlobalsGenerator.java index 3f86c521..ab4461f3 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/GlobalsGenerator.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/GlobalsGenerator.java @@ -1,6 +1,6 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNADeclarationsConverter.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNADeclarationsConverter.java index 93ec4048..5bbaf883 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNADeclarationsConverter.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNADeclarationsConverter.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java index f023a762..f1a563dd 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfig.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfig.java index 7675a081..fad727c6 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfig.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfig.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java index 4e5c91ec..76ae15e8 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorParser.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorParser.java index dfd22d01..a8616376 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorParser.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorParser.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorUtils.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorUtils.java index 85a9b73d..7cceb574 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorUtils.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/MissingNamesChooser.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/MissingNamesChooser.java index c805c6b7..a8b0253b 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/MissingNamesChooser.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/MissingNamesChooser.java @@ -1,6 +1,6 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/NodeJSDeclarationsConverter.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/NodeJSDeclarationsConverter.java index aa1d28bd..72be5c3f 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/NodeJSDeclarationsConverter.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/NodeJSDeclarationsConverter.java @@ -397,7 +397,7 @@ public void generateLibraryFiles(SourceFiles sourceFiles, Result result, JNAerat // TODO: list sources in fillLibraryMapping sources.add(sourcePath); - //out.println("///\n/// This file was autogenerated by JNAerator (http://jnaerator.googlecode.com/), \n/// a tool written by Olivier Chafik (http://ochafik.com/).\n///"); + //out.println("///\n/// This file was autogenerated by JNAerator (https://github.com/nativelibs4java/JNAerator), \n/// a tool written by Olivier Chafik (http://ochafik.com/).\n///"); SourceFile sourceFile = new SourceFile(); sourceFile.setElementFile(sourcePath); for (String inc : new String[]{"v8.h", "node.h", "node_buffer.h"}) { diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCGenerator.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCGenerator.java index b49b5021..6f8553a1 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCGenerator.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCGenerator.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCToJavaPreScanner.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCToJavaPreScanner.java index 3a34be0e..b6e3256d 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCToJavaPreScanner.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/ObjectiveCToJavaPreScanner.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/PreprocessorUtils.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/PreprocessorUtils.java index d46f7942..93cbe7c5 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/PreprocessorUtils.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/PreprocessorUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java index d7a82f0d..c033c6eb 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java @@ -1,7 +1,7 @@ /* oCpyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -780,7 +780,7 @@ public Struct notifyBeforeWritingClass(Identifier fullClassName, Struct interf, : ", Rococoa, " + "or JNA"; interf.addToCommentBefore( - "This file was autogenerated by JNAerator, ", + "This file was autogenerated by JNAerator, ", "a tool written by Olivier Chafik that uses a few opensource projects..", "For help, please visit NativeLibs4Java " + runtimeSpecificHelp + "."); diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/RococoaUtils.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/RococoaUtils.java index cc1ac3a0..1c117086 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/RococoaUtils.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/RococoaUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Signatures.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Signatures.java index 053734bb..438d98f7 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Signatures.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Signatures.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SimpleGUI.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SimpleGUI.java index 76ed8246..3aadf311 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SimpleGUI.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SimpleGUI.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SourceFiles.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SourceFiles.java index c946eddd..823fd1b4 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SourceFiles.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/SourceFiles.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Symbols.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Symbols.java index d200ecbf..5b01eb30 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Symbols.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Symbols.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/TypeConversion.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/TypeConversion.java index ed37f934..51c37de5 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/TypeConversion.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/TypeConversion.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/UnsupportedConversionException.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/UnsupportedConversionException.java index a00fcbbe..6a631c3c 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/UnsupportedConversionException.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/UnsupportedConversionException.java @@ -1,6 +1,6 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/AbstractNode.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/AbstractNode.java index 13bb0e5f..690800aa 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/AbstractNode.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/AbstractNode.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementListNode.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementListNode.java index ba085c58..005c3023 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementListNode.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementListNode.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementNode.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementNode.java index f732bed2..440464ab 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementNode.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ElementNode.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/JNAeratorStudio.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/JNAeratorStudio.java index 94b751ad..527397db 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/JNAeratorStudio.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/JNAeratorStudio.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ResultContent.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ResultContent.java index e0aa6f26..5e9257a6 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ResultContent.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/studio/ResultContent.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAerationTest.java b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAerationTest.java index e7decdd7..0dbb62d4 100644 --- a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAerationTest.java +++ b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAerationTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorConfigTest.java b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorConfigTest.java index 80a652f4..824df7d1 100644 --- a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorConfigTest.java +++ b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorConfigTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorTest.java b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorTest.java index 47730e84..48017490 100644 --- a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorTest.java +++ b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/JNAeratorTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/SystemHeadersTest.java b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/SystemHeadersTest.java index fbd3dd58..20fd4fba 100644 --- a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/SystemHeadersTest.java +++ b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/SystemHeadersTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/). /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java index 93da985b..399f13a2 100644 --- a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java +++ b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/jnaerator/src/test/resources/com/ochafik/lang/jnaerator/parser/ObjCppTest.mm b/jnaerator/src/test/resources/com/ochafik/lang/jnaerator/parser/ObjCppTest.mm index 1893ddf2..bd4e9f6e 100644 --- a/jnaerator/src/test/resources/com/ochafik/lang/jnaerator/parser/ObjCppTest.mm +++ b/jnaerator/src/test/resources/com/ochafik/lang/jnaerator/parser/ObjCppTest.mm @@ -1,7 +1,7 @@ # # Copyright (c) 2009 Olivier Chafik, All Rights Reserved # -# This file is part of JNAerator (http://jnaerator.googlecode.com/). +# This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). # # JNAerator is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/ochafik-swing/src/main/java/com/ochafik/beans/BeansController.java b/ochafik-swing/src/main/java/com/ochafik/beans/BeansController.java index fe80373b..30319520 100644 --- a/ochafik-swing/src/main/java/com/ochafik/beans/BeansController.java +++ b/ochafik-swing/src/main/java/com/ochafik/beans/BeansController.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/FormElement.java b/ochafik-swing/src/main/java/com/ochafik/swing/FormElement.java index cf6f4ce0..976dcadc 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/FormElement.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/FormElement.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/FormUtils.java b/ochafik-swing/src/main/java/com/ochafik/swing/FormUtils.java index 36264df5..a4691ed2 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/FormUtils.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/FormUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-swing/src/main/java/com/ochafik/swing/UndoRedoUtils.java b/ochafik-swing/src/main/java/com/ochafik/swing/UndoRedoUtils.java index ecc7a902..f5fb4f7d 100644 --- a/ochafik-swing/src/main/java/com/ochafik/swing/UndoRedoUtils.java +++ b/ochafik-swing/src/main/java/com/ochafik/swing/UndoRedoUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/beans/BeansUtils.java b/ochafik-util/src/main/java/com/ochafik/beans/BeansUtils.java index 8ca7dbb8..f6dfd531 100644 --- a/ochafik-util/src/main/java/com/ochafik/beans/BeansUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/beans/BeansUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/io/FileListUtils.java b/ochafik-util/src/main/java/com/ochafik/io/FileListUtils.java index 41eae6f6..6a491846 100644 --- a/ochafik-util/src/main/java/com/ochafik/io/FileListUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/io/FileListUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/io/IOUtils.java b/ochafik-util/src/main/java/com/ochafik/io/IOUtils.java index 325af5d1..68ca409b 100644 --- a/ochafik-util/src/main/java/com/ochafik/io/IOUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/io/IOUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/io/ReadText.java b/ochafik-util/src/main/java/com/ochafik/io/ReadText.java index 7db0d81a..571bb457 100644 --- a/ochafik-util/src/main/java/com/ochafik/io/ReadText.java +++ b/ochafik-util/src/main/java/com/ochafik/io/ReadText.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/io/StringBufferOutputStream.java b/ochafik-util/src/main/java/com/ochafik/io/StringBufferOutputStream.java index 76b814b6..203d8089 100644 --- a/ochafik-util/src/main/java/com/ochafik/io/StringBufferOutputStream.java +++ b/ochafik-util/src/main/java/com/ochafik/io/StringBufferOutputStream.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/io/WriteText.java b/ochafik-util/src/main/java/com/ochafik/io/WriteText.java index cb6e2184..d97c6ab5 100644 --- a/ochafik-util/src/main/java/com/ochafik/io/WriteText.java +++ b/ochafik-util/src/main/java/com/ochafik/io/WriteText.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/junit/ParameterizedWithDescription.java b/ochafik-util/src/main/java/com/ochafik/junit/ParameterizedWithDescription.java index 28ee5b7a..c960dbe5 100644 --- a/ochafik-util/src/main/java/com/ochafik/junit/ParameterizedWithDescription.java +++ b/ochafik-util/src/main/java/com/ochafik/junit/ParameterizedWithDescription.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/lang/AssertUtils.java b/ochafik-util/src/main/java/com/ochafik/lang/AssertUtils.java index 45be5c5f..c6beed64 100644 --- a/ochafik-util/src/main/java/com/ochafik/lang/AssertUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/lang/AssertUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/lang/SyntaxUtils.java b/ochafik-util/src/main/java/com/ochafik/lang/SyntaxUtils.java index 21f1ff6a..72ab7b4d 100644 --- a/ochafik-util/src/main/java/com/ochafik/lang/SyntaxUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/lang/SyntaxUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/lang/Threads.java b/ochafik-util/src/main/java/com/ochafik/lang/Threads.java index 919bea11..a6cb9cb1 100644 --- a/ochafik-util/src/main/java/com/ochafik/lang/Threads.java +++ b/ochafik-util/src/main/java/com/ochafik/lang/Threads.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/lang/reflect/DebugUtils.java b/ochafik-util/src/main/java/com/ochafik/lang/reflect/DebugUtils.java index b6c1b9fd..ef90a8f8 100644 --- a/ochafik-util/src/main/java/com/ochafik/lang/reflect/DebugUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/lang/reflect/DebugUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/lang/reflect/GettersAndSettersHelper.java b/ochafik-util/src/main/java/com/ochafik/lang/reflect/GettersAndSettersHelper.java index d47b11c6..ec07844e 100644 --- a/ochafik-util/src/main/java/com/ochafik/lang/reflect/GettersAndSettersHelper.java +++ b/ochafik-util/src/main/java/com/ochafik/lang/reflect/GettersAndSettersHelper.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/util/SystemUtils.java b/ochafik-util/src/main/java/com/ochafik/util/SystemUtils.java index 93a3ccad..d9057af8 100644 --- a/ochafik-util/src/main/java/com/ochafik/util/SystemUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/util/SystemUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/util/string/RegexUtils.java b/ochafik-util/src/main/java/com/ochafik/util/string/RegexUtils.java index 332cdf9e..2feee12d 100644 --- a/ochafik-util/src/main/java/com/ochafik/util/string/RegexUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/util/string/RegexUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/util/string/StringUtils.java b/ochafik-util/src/main/java/com/ochafik/util/string/StringUtils.java index 767f041d..6828e313 100644 --- a/ochafik-util/src/main/java/com/ochafik/util/string/StringUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/util/string/StringUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/xml/XMLUtils.java b/ochafik-util/src/main/java/com/ochafik/xml/XMLUtils.java index a7f39db8..30d33196 100644 --- a/ochafik-util/src/main/java/com/ochafik/xml/XMLUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/xml/XMLUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ochafik-util/src/main/java/com/ochafik/xml/XPathUtils.java b/ochafik-util/src/main/java/com/ochafik/xml/XPathUtils.java index f2913ba3..32a96b31 100644 --- a/ochafik-util/src/main/java/com/ochafik/xml/XPathUtils.java +++ b/ochafik-util/src/main/java/com/ochafik/xml/XPathUtils.java @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Olivier Chafik, All Rights Reserved - This file is part of JNAerator (http://jnaerator.googlecode.com/). + This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). JNAerator is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/resources/JNAeratorStudio.jnlp b/resources/JNAeratorStudio.jnlp index 4c700a8c..0d16074f 100644 --- a/resources/JNAeratorStudio.jnlp +++ b/resources/JNAeratorStudio.jnlp @@ -6,7 +6,7 @@ JNAerator Studio Olivier Chafik - + JNAerator : Java gets to love native libraries ! JNAerator Studio : wrap C and Objective-C libraries in Java. diff --git a/webstart/JNAeratorStudio.jnlp b/webstart/JNAeratorStudio.jnlp index 5385ecbf..4b2a16ca 100644 --- a/webstart/JNAeratorStudio.jnlp +++ b/webstart/JNAeratorStudio.jnlp @@ -6,7 +6,7 @@ JNAerator Studio Olivier Chafik - + JNAerator : Java gets to love native libraries ! JNAerator Studio : wrap C and Objective-C libraries in Java. From 9e0b9b0c5e5882711515c1964e2498af2e816113 Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Fri, 17 Aug 2018 11:07:53 -0500 Subject: [PATCH 05/10] Aquire all linux headers (#2) * clear - remove target subdirs * add all Linux include paths --- clear.sh | 7 + .../lang/jnaerator/JNAeratorConfigUtils.java | 156 ++++++++++++++---- 2 files changed, 134 insertions(+), 29 deletions(-) create mode 100755 clear.sh diff --git a/clear.sh b/clear.sh new file mode 100755 index 00000000..541d880d --- /dev/null +++ b/clear.sh @@ -0,0 +1,7 @@ +for file in * +do + if [[ -d "$file" ]] + then + rm $file/target -f -r + fi +done \ No newline at end of file diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java index 76ae15e8..8ed8d75d 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorConfigUtils.java @@ -74,8 +74,125 @@ static String getProp(String name, String defVal, boolean verbose) { "/Local/Library/Frameworks/", System.getProperty("user.home") + "/Library/Frameworks"); static List DEFAULT_INCLUDE_PATH; - - static { + + private static String findGCCMainLibInclude() + { + boolean is64bitOS = System.getProperty("sun.arch.data.model").equals("64"); + File gccDir = new File("/usr/lib/gcc"); + for (File f : gccDir.listFiles()) { + if (!f.isDirectory()) { + continue; + } + String archName = f.getName(); + boolean is64Name = archName.contains("_64-"); + if (is64bitOS==is64Name) + return f.getAbsolutePath(); + } + return ""; + } + + private static String findGCCLibInclude() + { + String gccArch = findGCCMainLibInclude(); + if (gccArch=="") return ""; + File gccArchDir = new File(gccArch); + TreeSet versions = new TreeSet(); + if (gccArchDir.isDirectory()) { + for (File f : gccArchDir.listFiles()) { + if (!f.isDirectory()) { + continue; + } + String n = f.getName(); + if (!n.matches("[\\d+](\\.[\\d+])*")) { + continue; + } + if (!(new File(f, "include").exists() )) { + continue; + } + versions.add(n); + } + } + if (!versions.isEmpty()) { + File d = new File(gccArchDir, versions.last()); + return d.getAbsolutePath()+"/include"; + } + return ""; + } + + private static String findArchInclude() + { + boolean is64bitOS = System.getProperty("sun.arch.data.model").equals("64"); + String arch; + if (is64bitOS) + arch = "x86_64-linux-gnu"; + else + arch = "i686-linux-gnu"; + return "/usr/include/" + arch; + } + + private static String findArchCppInclude() + { + boolean is64bitOS = System.getProperty("sun.arch.data.model").equals("64"); + String arch; + if (is64bitOS) + arch = "x86_64-linux-gnu"; + else + arch = "i686-linux-gnu"; + File cppDir = new File("/usr/include/" + arch + "/c++"); + TreeSet versions = new TreeSet(); + if (cppDir.isDirectory()) { + for (File f : cppDir.listFiles()) { + if (!f.isDirectory()) { + continue; + } + String n = f.getName(); + if (!n.matches("[\\d+](\\.[\\d+])*")) { + continue; + } + if (!(new File(f, "bits").exists())) { + continue; + } + versions.add(n); + } + } + if (!versions.isEmpty()) { + File d = new File(cppDir, versions.last()); + return d.getAbsolutePath(); + } + return ""; + } + + /* + * /usr/include/c++ is likely to contain directories with versions such as 4.0.0, 4.4.0... + * We try to take the greatest version (in lexicographic order of matching dir names) and check that it contains "new" and "map" files + */ + private static String findCPPInclude() + { + File cppDir = new File("/usr/include/c++"); + TreeSet versions = new TreeSet(); + if (cppDir.isDirectory()) { + for (File f : cppDir.listFiles()) { + if (!f.isDirectory()) { + continue; + } + String n = f.getName(); + if (!n.matches("[\\d+](\\.[\\d+])*")) { + continue; + } + if (!(new File(f, "new").exists() && new File(f, "map").exists())) { + continue; + } + versions.add(n); + } + } + if (!versions.isEmpty()) { + File d = new File(cppDir, versions.last()); + return d.getAbsolutePath(); + } + return ""; + } + + static { if (SystemUtils.isMacOSX()) { DEFAULT_INCLUDE_PATH = new ArrayList(); for (String s : new String[]{ @@ -99,33 +216,14 @@ static String getProp(String name, String defVal, boolean verbose) { if (SystemUtils.isUnix()) { DEFAULT_INCLUDE_PATH.add("/usr/include"); DEFAULT_INCLUDE_PATH.add("/usr/local/include"); - - /* - * /usr/include/c++ is likely to contain directories with versions such as 4.0.0, 4.4.0... - * We try to take the greatest version (in lexicographic order of matching dir names) and check that it contains "new" and "map" files - */ - File cppi = new File("/usr/include/c++"); - TreeSet versions = new TreeSet(); - if (cppi.isDirectory()) { - for (File f : cppi.listFiles()) { - if (!f.isDirectory()) { - continue; - } - String n = f.getName(); - if (!n.matches("[\\d+](\\.[\\d+])*")) { - continue; - } - if (!(new File(f, "new").exists() && new File(f, "map").exists())) { - continue; - } - versions.add(n); - } - } - if (!versions.isEmpty()) { - File d = new File(cppi, versions.last()); - DEFAULT_INCLUDE_PATH.add(d.toString()); - DEFAULT_INCLUDE_PATH.add(new File(d, "tr1").toString()); - } + DEFAULT_INCLUDE_PATH.add(findArchInclude()); + String cppDir = findCPPInclude(); + DEFAULT_INCLUDE_PATH.add(cppDir); + DEFAULT_INCLUDE_PATH.add(cppDir+"/tr1"); + String gccLibDir = findGCCLibInclude(); + DEFAULT_INCLUDE_PATH.add(gccLibDir); + String cppArchDir = findArchCppInclude(); + DEFAULT_INCLUDE_PATH.add(cppArchDir); } DEFAULT_INCLUDE_PATH = Collections.unmodifiableList(DEFAULT_INCLUDE_PATH); } From 179f7cd2ad082138d0afdd426a3b6d1856766bb0 Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Fri, 17 Aug 2018 11:08:43 -0500 Subject: [PATCH 06/10] update link for help in generated files --- .gitignore | 2 ++ .../src/main/java/com/ochafik/lang/jnaerator/Result.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e0d5325..f650616d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ target project/boot project/target *~ +.settings/ +.idea/ diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java index c033c6eb..879ab977 100644 --- a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java +++ b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/Result.java @@ -1,5 +1,5 @@ /* - oCpyright (c) 2009-2013 Olivier Chafik, All Rights Reserved + Copyright (c) 2009-2013 Olivier Chafik, All Rights Reserved This file is part of JNAerator (https://github.com/nativelibs4java/JNAerator). @@ -782,7 +782,7 @@ public Struct notifyBeforeWritingClass(Identifier fullClassName, Struct interf, interf.addToCommentBefore( "This file was autogenerated by JNAerator, ", "a tool written by Olivier Chafik that uses a few opensource projects..", - "For help, please visit NativeLibs4Java " + "For help, please visit NativeLibs4Java " + runtimeSpecificHelp + "."); for (ClassWritingNotifiable n : classWritingNotifiables) { From c615f526707531247066f3257c9960bc07b0998e Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Tue, 21 Aug 2018 15:27:54 -0500 Subject: [PATCH 07/10] make a jnaerator-gradle-plugin --- .gitignore | 5 ++ jnaerator-gradle-plugin/.gitignore | 2 + jnaerator-gradle-plugin/LICENSE.txt | 2 + jnaerator-gradle-plugin/README.adoc | 74 +++++++++++++++++ jnaerator-gradle-plugin/build.gradle | 32 ++++++++ jnaerator-gradle-plugin/gradle.properties | 0 .../gradle/artifactory.gradle | 31 +++++++ jnaerator-gradle-plugin/gradle/bintray.gradle | 16 ++++ jnaerator-gradle-plugin/gradle/compile.gradle | 17 ++++ .../gradle/credentials.gradle | 2 + .../gradle/publishing.gradle | 50 ++++++++++++ jnaerator-gradle-plugin/settings.gradle | 3 + .../main/java/babeloff/JNAeratorPlugin.java | 23 ++++++ .../src/main/java/babeloff/JNAeratorTask.java | 80 +++++++++++++++++++ .../babeloff.jnaerator.properties | 1 + .../gradle/JNAeratorPluginTest.groovy | 19 +++++ .../src/test/resource/Test.h | 28 +++++++ .../src/test/resource/test_config.jnae | 14 ++++ .../jnaerator/parser/ObjCppParsingTest.java | 12 +-- 19 files changed, 405 insertions(+), 6 deletions(-) create mode 100644 jnaerator-gradle-plugin/.gitignore create mode 100644 jnaerator-gradle-plugin/LICENSE.txt create mode 100644 jnaerator-gradle-plugin/README.adoc create mode 100644 jnaerator-gradle-plugin/build.gradle create mode 100644 jnaerator-gradle-plugin/gradle.properties create mode 100644 jnaerator-gradle-plugin/gradle/artifactory.gradle create mode 100644 jnaerator-gradle-plugin/gradle/bintray.gradle create mode 100644 jnaerator-gradle-plugin/gradle/compile.gradle create mode 100644 jnaerator-gradle-plugin/gradle/credentials.gradle create mode 100644 jnaerator-gradle-plugin/gradle/publishing.gradle create mode 100644 jnaerator-gradle-plugin/settings.gradle create mode 100644 jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorPlugin.java create mode 100644 jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java create mode 100644 jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties create mode 100644 jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy create mode 100644 jnaerator-gradle-plugin/src/test/resource/Test.h create mode 100644 jnaerator-gradle-plugin/src/test/resource/test_config.jnae diff --git a/.gitignore b/.gitignore index f650616d..6d2d1087 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,8 @@ project/target *~ .settings/ .idea/ +**/*.iml +**/.classpath +**/.factorypath +**/.gradle +**/.project diff --git a/jnaerator-gradle-plugin/.gitignore b/jnaerator-gradle-plugin/.gitignore new file mode 100644 index 00000000..67bcc2f7 --- /dev/null +++ b/jnaerator-gradle-plugin/.gitignore @@ -0,0 +1,2 @@ +.gradle/ +build/ diff --git a/jnaerator-gradle-plugin/LICENSE.txt b/jnaerator-gradle-plugin/LICENSE.txt new file mode 100644 index 00000000..883419be --- /dev/null +++ b/jnaerator-gradle-plugin/LICENSE.txt @@ -0,0 +1,2 @@ +MIT License +Copyright Fred Eisele phreed@gmail.com diff --git a/jnaerator-gradle-plugin/README.adoc b/jnaerator-gradle-plugin/README.adoc new file mode 100644 index 00000000..4d649035 --- /dev/null +++ b/jnaerator-gradle-plugin/README.adoc @@ -0,0 +1,74 @@ += JNAerate Gradle Plugin +:jnaerator-url: https://github.com/babeloff/JNAerator +:issues: https://github.com/babeloff/JNAerator/issues +:gradle-url: http://gradle.org/ + +image:https://travis-ci.org/babeloff/jnaerator-gradle-plugin.png?branch=master["Build Status", link="https://travis-ci.org/melix/jnaerator-gradle-plugin"] + +The jnaerator-gradle-plugin provides an easy way to generate grammars with {jnaerator-url}[Antlr4] using {gradle-url}[Gradle]. + +== Installation + +Use the following snippet inside a Gradle build file: + +[source,groovy] +.build.gradle +---- +buildscript { + repositories { + maven { + name 'JFrog OSS snapshot repo' + url 'https://oss.jfrog.org/oss-snapshot-local/' + } + jcenter() + } + + dependencies { + classpath 'babeloff:jnaerator-gradle-plugin:0.13-SNAPSHOT' + } +} + +repositories { + jcenter() +} + +apply plugin: 'babeloff.jnaerator' +---- + +== Configuration + +The plugin adds a new task named `jnaerator`. This task exposes 5 properties as part of its configuration + +[horizontal] +config:: where the source grammars are. Type: File. Default: `src/main/jnaerator`. +output:: where generated sources go. Type: File. Default: `$buildDir/generated-src`. + +== Usage +=== Basic generation + +Generating grammars can be done by calling the `jnaerator` task: + +``` +gradle jnaerator +``` + +=== Dependency on generated sources + +In general, you will want your main project to depend on the generated sources for compilation. You can easily do +this by adding this configuration into your `build.gradle`: + + +[source,groovy] +.build.gradle +---- +// make the Java compile task depend on the jnaerator task +compileJava.dependsOn jnaerator + +// add the generated source files to the list of java sources +sourceSets.main.java.srcDirs += jnaerator.output + +// add jnaerator to classpath +configurations { + compile.extendsFrom jnaerator +} +---- diff --git a/jnaerator-gradle-plugin/build.gradle b/jnaerator-gradle-plugin/build.gradle new file mode 100644 index 00000000..7fb940e2 --- /dev/null +++ b/jnaerator-gradle-plugin/build.gradle @@ -0,0 +1,32 @@ + +apply plugin: 'idea' +apply from: 'gradle/credentials.gradle' +apply from: 'gradle/compile.gradle' +apply from: 'gradle/publishing.gradle' +apply from: 'gradle/bintray.gradle' +apply from: 'gradle/artifactory.gradle' + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.3' + classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.4' + } +} + +dependencies { + compile localGroovy() + compile gradleApi() + compile 'com.nativelibs4java:jnaerator:0.13-SNAPSHOT' + testCompile 'junit:junit:4.11' +} + +group='babeloff' +version='0.13-SNAPSHOT' + +task release { + description = "Releases a version of the plugin on Artifactory and Bintray" + dependsOn artifactoryPublish, bintrayUpload +} diff --git a/jnaerator-gradle-plugin/gradle.properties b/jnaerator-gradle-plugin/gradle.properties new file mode 100644 index 00000000..e69de29b diff --git a/jnaerator-gradle-plugin/gradle/artifactory.gradle b/jnaerator-gradle-plugin/gradle/artifactory.gradle new file mode 100644 index 00000000..d01335ed --- /dev/null +++ b/jnaerator-gradle-plugin/gradle/artifactory.gradle @@ -0,0 +1,31 @@ +// handles distribution of snapshots to Artifactory (oss.jfrog.org) + +apply plugin: 'artifactory-publish' + +artifactory { + contextUrl = 'http://oss.jfrog.org/artifactory' + publish { + repository { + repoKey = 'oss-snapshot-local' + username = bintrayUsername + password = bintrayKey + } + defaults { + publications ('mavenJava') + } + } + resolve { + repository { + repoKey = 'libs-release' + } + } + +} + +artifactoryPublish { + onlyIf { + def pullRequest = System.getenv('TRAVIS_PULL_REQUEST') + + !pullRequest || pullRequest=='false' + } +} \ No newline at end of file diff --git a/jnaerator-gradle-plugin/gradle/bintray.gradle b/jnaerator-gradle-plugin/gradle/bintray.gradle new file mode 100644 index 00000000..0dd473cf --- /dev/null +++ b/jnaerator-gradle-plugin/gradle/bintray.gradle @@ -0,0 +1,16 @@ +// Handles publication of distributions to Bintray + +apply plugin: 'bintray' + +bintray { + user = bintrayUsername + key = bintrayKey + publications = ['mavenJava'] + pkg { + repo = 'gradle-plugins' + name = 'jnaerator-gradle-plugin' + desc = 'An JNAerator plugin for Gradle' + licenses = ['MIT'] + labels = ['jnaerator', 'gradle'] + } +} \ No newline at end of file diff --git a/jnaerator-gradle-plugin/gradle/compile.gradle b/jnaerator-gradle-plugin/gradle/compile.gradle new file mode 100644 index 00000000..079be0b1 --- /dev/null +++ b/jnaerator-gradle-plugin/gradle/compile.gradle @@ -0,0 +1,17 @@ +apply plugin: 'groovy' + +sourceCompatibility=1.8 +targetCompatibility=1.8 + +compileGroovy.options.encoding = 'UTF-8' + +// custom tasks for creating source/javadoc jars +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} diff --git a/jnaerator-gradle-plugin/gradle/credentials.gradle b/jnaerator-gradle-plugin/gradle/credentials.gradle new file mode 100644 index 00000000..58eb49eb --- /dev/null +++ b/jnaerator-gradle-plugin/gradle/credentials.gradle @@ -0,0 +1,2 @@ +ext.bintrayUsername = project.hasProperty('bintrayUsername')?project.getProperty('bintrayUsername'):System.getenv('BINTRAY_USER')?:'' +ext.bintrayKey = project.hasProperty('bintrayKey')?project.getProperty('bintrayKey'):System.getenv('BINTRAY_KEY')?:'' diff --git a/jnaerator-gradle-plugin/gradle/publishing.gradle b/jnaerator-gradle-plugin/gradle/publishing.gradle new file mode 100644 index 00000000..880380e1 --- /dev/null +++ b/jnaerator-gradle-plugin/gradle/publishing.gradle @@ -0,0 +1,50 @@ +// configuration of the Maven artifacts +apply plugin: 'maven-publish' + +// add javadoc/source jar tasks as artifacts +artifacts { + archives sourcesJar, javadocJar +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + + artifact sourcesJar { + classifier "sources" + } + + artifact javadocJar { + classifier "javadoc" + } + + pom.withXml { + def Node root = asNode() + root.appendNode('name', 'Gradle Plugin for JNAerate') + root.appendNode('description', 'Gradle plugin for generating grammars with JNAerate') + root.appendNode('url', 'https://github.com/babeloff/jnaerator-gradle-plugin') + + def issues = root.appendNode( 'issueManagement' ) + issues.appendNode( 'system', 'github' ) + issues.appendNode( 'url', 'https://github.com/babeloff/jnaerator-gradle-plugin/issues' ) + + def scm = root.appendNode( 'scm' ) + scm.appendNode( 'url', 'https://github.com/babeloff/jnaerator-gradle-plugin' ) + scm.appendNode( 'connection', 'scm:git:https://github.com/babeloff/jnaerator-gradle-plugin.git' ) + scm.appendNode( 'developerConnection', 'scm:git:git@github.com:babeloff/jnaerator-gradle-plugin.git' ) + + def license = root.appendNode( 'licenses' ).appendNode( 'license' ); + license.appendNode( 'name', 'The MIT License' ) + license.appendNode( 'url', 'http://www.apache.org/licenses/LICENSE-2.0.txt' ) + license.appendNode( 'distribution', 'repo' ) + + def dev = root.appendNode( 'developers' ).appendNode( 'developer' ); + dev.appendNode( 'id', 'babeloff' ) + dev.appendNode( 'name', 'Fred Eisele') + dev.appendNode( 'organization', 'Groovy' ) + dev.appendNode( 'organizationUrl', 'http://groovy.codehaus.org' ) + } + } + } +} \ No newline at end of file diff --git a/jnaerator-gradle-plugin/settings.gradle b/jnaerator-gradle-plugin/settings.gradle new file mode 100644 index 00000000..52966091 --- /dev/null +++ b/jnaerator-gradle-plugin/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name='jnaerator-gradle-plugin' + +enableFeaturePreview('STABLE_PUBLISHING') \ No newline at end of file diff --git a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorPlugin.java b/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorPlugin.java new file mode 100644 index 00000000..f494d252 --- /dev/null +++ b/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorPlugin.java @@ -0,0 +1,23 @@ +package babeloff; + +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.Task; + +public class JNAeratorPlugin implements Plugin { + + private static final String GENERATE_TASK = "generate"; + + public void apply(Project project) { + final Task task = project.getTasks().create(GENERATE_TASK, JNAeratorTask.class); + // (task) -> { + // task.setConfig("test_config.jnae"); + // task.setOutputDirectory("World"); + // }); + //project.configurations { jnaerator } + //project.dependencies { + // jnaerator "com.nativelibs4java:jnaerator:0.13-SNAPSHOT" + //} + //project.task("jnaerator", type:JNAerateTask) + } +} diff --git a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java b/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java new file mode 100644 index 00000000..832000b2 --- /dev/null +++ b/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java @@ -0,0 +1,80 @@ +package babeloff; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.ArrayList; + +import org.gradle.api.DefaultTask; +import org.gradle.api.tasks.TaskAction; +import org.gradle.api.tasks.InputFile; +import org.gradle.api.tasks.InputDirectory; + +import org.gradle.api.tasks.TaskExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.ochafik.lang.jnaerator.JNAerator; +import com.ochafik.lang.jnaerator.JNAeratorConfig; + +public class JNAeratorTask extends DefaultTask { + + /** + * Path to JNAerator configuration file. + */ + private File config; + @InputFile + public File getConfig() { return this.config; } + public void setConfig(File config) { this.config = config; } + + /** + * Output directory for JNAerated Java sources. + */ + private File output; + @InputDirectory + public File getOutput() { return this.output; } + public void setOutput(File dir) { this.output = dir; } + + /** + * + * @return cononical directory path + */ + static File canonizeDir(final File f) throws IOException { + if (!f.exists()) { f.mkdirs(); } + return f.getCanonicalFile(); + } + + @TaskAction + void generate() throws TaskExecutionException { + if (!config.exists()) { + this.getLogger().info("No JNAerator config file '" + config + "' found"); + return; + } + try { + final List args = new ArrayList<>(); + args.add(config.getAbsolutePath()); + final String modeName = + JNAeratorConfig.OutputMode.Directory.name(); + final String javaDirStr = + canonizeDir(this.output).toString(); + final String configStr = + canonizeDir(this.config).toString(); + // Override settings from config file : + args.add("-mode"); args.add(modeName); + args.add("-f"); + args.add("@"); args.add(configStr); + args.add("-o"); args.add(javaDirStr); + + JNAerator.main(args.toArray(new String[0])); + } + catch (Exception ex) { + final Exception newex = new Exception("Error running JNAerator on " + this.config, ex); + throw new TaskExecutionException( this, newex ); + } finally { + System.out.printf("%s, %s!\n", + this.config.toString(), + this.output.toString()); + + } + } +} \ No newline at end of file diff --git a/jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties b/jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties new file mode 100644 index 00000000..e9dc8292 --- /dev/null +++ b/jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties @@ -0,0 +1 @@ +implementation-class=babeloff.JNAeratorPlugin \ No newline at end of file diff --git a/jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy b/jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy new file mode 100644 index 00000000..3fd51ef2 --- /dev/null +++ b/jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy @@ -0,0 +1,19 @@ +package babeloff.gradle + +import org.gradle.api.Project +import org.gradle.testfixtures.ProjectBuilder +import org.junit.Test + +class JNAeratorPluginTest { + @Test + void pluginIsApplied() { + Project project = ProjectBuilder.builder().build() + project.apply plugin: 'babeloff.jnaerator' + + def task = project.tasks.findByName('generate') + assert task instanceof babeloff.JNAeratorTask + //task.config = project.file("$project.output/generated-src") + //assert task.config == project.file("src/test/resource/test_config.jnae") + //assert task.output == project.file("$project.output/generated-src") + } +} \ No newline at end of file diff --git a/jnaerator-gradle-plugin/src/test/resource/Test.h b/jnaerator-gradle-plugin/src/test/resource/Test.h new file mode 100644 index 00000000..8d8e0dbb --- /dev/null +++ b/jnaerator-gradle-plugin/src/test/resource/Test.h @@ -0,0 +1,28 @@ + +struct Pair { + // Comment on both first and second + int first, second; +}; + +#define PAIRS_COUNT 10 + +#define EXPRESSION (1 << 10) | (1 << 5) + +enum Values { +First, // first comments +Second, // comments on second +Last // not a real value +}; + +struct BiggerStruct { + Values enumValue; + bool (*hook)(int val); + long longValue; + int intArray[sizeof(Pair) * PAIRS_COUNT]; +}; + +// Wonderful comments on Test function +void Test(BiggerStruct& s); + +// Be careful with that one : intArray and source are const, dest is not void +CopyBytes(char* dest, const char* source, size_t n, const int* intArray); \ No newline at end of file diff --git a/jnaerator-gradle-plugin/src/test/resource/test_config.jnae b/jnaerator-gradle-plugin/src/test/resource/test_config.jnae new file mode 100644 index 00000000..cf8db804 --- /dev/null +++ b/jnaerator-gradle-plugin/src/test/resource/test_config.jnae @@ -0,0 +1,14 @@ +-f +-beautifyNames +-v +-direct +-skipDeprecated +-o ./gen-src/main/java +-mode Directory +// -runtime JNA +-runtime BridJ +-arch linux_x64 +-rootPackage nng +-library core +./resource/Test.h +-o ./src/test/resource/generated-src \ No newline at end of file diff --git a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java index 399f13a2..6c21cec0 100644 --- a/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java +++ b/jnaerator/src/test/java/com/ochafik/lang/jnaerator/parser/ObjCppParsingTest.java @@ -141,12 +141,12 @@ public void test() throws RecognitionException, IOException { } } - static String lineAware(String s) { - return s.replaceAll("\n\r", "\n").replace("\r", "\n").replaceAll("\\s+", " "); - } - public static void assertEqualsNewLineAware(String message, String a, String b) { - assertEquals(message, lineAware(a), lineAware(b)); - } + static String lineAware(String s) { + return s.replaceAll("\n\r", "\n").replace("\r", "\n").replaceAll("\\s+", " "); + } + public static void assertEqualsNewLineAware(String message, String a, String b) { + assertEquals(message, lineAware(a), lineAware(b)); + } @Parameters public static List readDataFromFile() throws IOException { From 4249e3c70c798431b959e905314ded2984f377a4 Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Tue, 21 Aug 2018 17:34:35 -0500 Subject: [PATCH 08/10] cut and paste errors --- jnaerator-gradle-plugin/README.adoc | 4 ++-- .../src/main/java/babeloff/JNAeratorTask.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jnaerator-gradle-plugin/README.adoc b/jnaerator-gradle-plugin/README.adoc index 4d649035..a63e5cb9 100644 --- a/jnaerator-gradle-plugin/README.adoc +++ b/jnaerator-gradle-plugin/README.adoc @@ -3,9 +3,9 @@ :issues: https://github.com/babeloff/JNAerator/issues :gradle-url: http://gradle.org/ -image:https://travis-ci.org/babeloff/jnaerator-gradle-plugin.png?branch=master["Build Status", link="https://travis-ci.org/melix/jnaerator-gradle-plugin"] +image:https://travis-ci.org/babeloff/jnaerator-gradle-plugin.png?branch=master["Build Status", link="https://travis-ci.org/babeloff/jnaerator-gradle-plugin"] -The jnaerator-gradle-plugin provides an easy way to generate grammars with {jnaerator-url}[Antlr4] using {gradle-url}[Gradle]. +The jnaerator-gradle-plugin provides an easy way to generate JNA bindings {jnaerator-url}[JNAerator] using {gradle-url}[Gradle]. == Installation diff --git a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java b/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java index 832000b2..4103ec56 100644 --- a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java +++ b/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java @@ -8,7 +8,7 @@ import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.InputFile; -import org.gradle.api.tasks.InputDirectory; +import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.TaskExecutionException; import org.slf4j.Logger; @@ -31,7 +31,7 @@ public class JNAeratorTask extends DefaultTask { * Output directory for JNAerated Java sources. */ private File output; - @InputDirectory + @OutputDirectory public File getOutput() { return this.output; } public void setOutput(File dir) { this.output = dir; } From 11ae46cfbdaca64bd164b6241a673db20f268021 Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Tue, 28 Aug 2018 10:52:00 -0500 Subject: [PATCH 09/10] added simple test --- jnaerator-gradle-plugin/README.adoc | 2 +- jnaerator-gradle-plugin/build.gradle | 21 ++++++++++------ .../gradle/JNAeratorPluginTest.groovy | 19 -------------- .../babeloff/gradle/JNAeratorPluginTest.java | 25 +++++++++++++++++++ 4 files changed, 40 insertions(+), 27 deletions(-) delete mode 100644 jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy create mode 100644 jnaerator-gradle-plugin/src/test/java/babeloff/gradle/JNAeratorPluginTest.java diff --git a/jnaerator-gradle-plugin/README.adoc b/jnaerator-gradle-plugin/README.adoc index a63e5cb9..86bd90dd 100644 --- a/jnaerator-gradle-plugin/README.adoc +++ b/jnaerator-gradle-plugin/README.adoc @@ -37,7 +37,7 @@ apply plugin: 'babeloff.jnaerator' == Configuration -The plugin adds a new task named `jnaerator`. This task exposes 5 properties as part of its configuration +The plugin adds a new task named `generate`. [horizontal] config:: where the source grammars are. Type: File. Default: `src/main/jnaerator`. diff --git a/jnaerator-gradle-plugin/build.gradle b/jnaerator-gradle-plugin/build.gradle index 7fb940e2..76812a82 100644 --- a/jnaerator-gradle-plugin/build.gradle +++ b/jnaerator-gradle-plugin/build.gradle @@ -1,11 +1,4 @@ -apply plugin: 'idea' -apply from: 'gradle/credentials.gradle' -apply from: 'gradle/compile.gradle' -apply from: 'gradle/publishing.gradle' -apply from: 'gradle/bintray.gradle' -apply from: 'gradle/artifactory.gradle' - buildscript { repositories { jcenter() @@ -16,6 +9,19 @@ buildscript { } } +plugins { + id 'java-gradle-plugin' +} + +apply plugin: 'idea' +apply from: 'gradle/credentials.gradle' +apply from: 'gradle/compile.gradle' +apply from: 'gradle/publishing.gradle' +apply from: 'gradle/bintray.gradle' +apply from: 'gradle/artifactory.gradle' + + + dependencies { compile localGroovy() compile gradleApi() @@ -30,3 +36,4 @@ task release { description = "Releases a version of the plugin on Artifactory and Bintray" dependsOn artifactoryPublish, bintrayUpload } + diff --git a/jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy b/jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy deleted file mode 100644 index 3fd51ef2..00000000 --- a/jnaerator-gradle-plugin/src/test/groovy/babeloff/gradle/JNAeratorPluginTest.groovy +++ /dev/null @@ -1,19 +0,0 @@ -package babeloff.gradle - -import org.gradle.api.Project -import org.gradle.testfixtures.ProjectBuilder -import org.junit.Test - -class JNAeratorPluginTest { - @Test - void pluginIsApplied() { - Project project = ProjectBuilder.builder().build() - project.apply plugin: 'babeloff.jnaerator' - - def task = project.tasks.findByName('generate') - assert task instanceof babeloff.JNAeratorTask - //task.config = project.file("$project.output/generated-src") - //assert task.config == project.file("src/test/resource/test_config.jnae") - //assert task.output == project.file("$project.output/generated-src") - } -} \ No newline at end of file diff --git a/jnaerator-gradle-plugin/src/test/java/babeloff/gradle/JNAeratorPluginTest.java b/jnaerator-gradle-plugin/src/test/java/babeloff/gradle/JNAeratorPluginTest.java new file mode 100644 index 00000000..269eb210 --- /dev/null +++ b/jnaerator-gradle-plugin/src/test/java/babeloff/gradle/JNAeratorPluginTest.java @@ -0,0 +1,25 @@ +package babeloff.gradle; + +import org.gradle.api.Project; +import org.gradle.testfixtures.ProjectBuilder; +import org.gradle.api.plugins.PluginManager; +import org.junit.Test; +import org.junit.Assert; + +public class JNAeratorPluginTest { + @Test + public void pluginTaskExists() { + final String pluginId = "babeloff.jnaerator"; + final Project project = ProjectBuilder.builder().build(); + final PluginManager pm = project.getPluginManager(); + + pm.apply(pluginId); + Assert.assertTrue(pm.hasPlugin(pluginId)); + Assert.assertNotNull(project.getTasks().getByName("generate")); + + // assert task instanceof babeloff.JNAeratorTask + //task.config = project.file("$project.output/generated-src") + //assert task.config == project.file("src/test/resource/test_config.jnae") + //assert task.output == project.file("$project.output/generated-src") + } +} \ No newline at end of file From d2595a0c03c91784d8396277eb16667a329c89f0 Mon Sep 17 00:00:00 2001 From: Fred Eisele Date: Tue, 28 Aug 2018 13:35:09 -0500 Subject: [PATCH 10/10] expanded the group a bit to babeloff.jnaerator --- .gitignore | 4 +++ jnaerator-gradle-plugin/build.gradle | 35 +++++++++++++++---- .../{ => jnaerator}/JNAeratorPlugin.java | 2 +- .../{ => jnaerator}/JNAeratorTask.java | 2 +- .../babeloff.jnaerator.properties | 2 +- 5 files changed, 35 insertions(+), 10 deletions(-) rename jnaerator-gradle-plugin/src/main/java/babeloff/{ => jnaerator}/JNAeratorPlugin.java (96%) rename jnaerator-gradle-plugin/src/main/java/babeloff/{ => jnaerator}/JNAeratorTask.java (98%) diff --git a/.gitignore b/.gitignore index 6d2d1087..5e8ab1e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +gradle/wrapper/ +gradlew +gradlew.bat + target project/boot project/target diff --git a/jnaerator-gradle-plugin/build.gradle b/jnaerator-gradle-plugin/build.gradle index 76812a82..43065176 100644 --- a/jnaerator-gradle-plugin/build.gradle +++ b/jnaerator-gradle-plugin/build.gradle @@ -11,8 +11,13 @@ buildscript { plugins { id 'java-gradle-plugin' + id 'maven-publish' + id 'ivy-publish' } +group='babeloff' +version='0.13-SNAPSHOT' + apply plugin: 'idea' apply from: 'gradle/credentials.gradle' apply from: 'gradle/compile.gradle' @@ -20,20 +25,36 @@ apply from: 'gradle/publishing.gradle' apply from: 'gradle/bintray.gradle' apply from: 'gradle/artifactory.gradle' - - dependencies { compile localGroovy() compile gradleApi() - compile 'com.nativelibs4java:jnaerator:0.13-SNAPSHOT' - testCompile 'junit:junit:4.11' + compile group: 'com.nativelibs4java', name: 'jnaerator', version: '0.13-SNAPSHOT' + testCompile group: 'junit', name: 'junit', version: '4.11' } -group='babeloff' -version='0.13-SNAPSHOT' - task release { description = "Releases a version of the plugin on Artifactory and Bintray" dependsOn artifactoryPublish, bintrayUpload } +gradlePlugin { + plugins { + jnaerator { + id = "babeloff.jnaerator" + implementationClass = "babeloff.jnaerator.JNAeratorPlugin" + } + } +} + +publishing { + repositories { + maven { + url "../consuming/maven-repo" + } + ivy { + url "../consuming/ivy-repo" + } + } +} + + diff --git a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorPlugin.java b/jnaerator-gradle-plugin/src/main/java/babeloff/jnaerator/JNAeratorPlugin.java similarity index 96% rename from jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorPlugin.java rename to jnaerator-gradle-plugin/src/main/java/babeloff/jnaerator/JNAeratorPlugin.java index f494d252..ade308cf 100644 --- a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorPlugin.java +++ b/jnaerator-gradle-plugin/src/main/java/babeloff/jnaerator/JNAeratorPlugin.java @@ -1,4 +1,4 @@ -package babeloff; +package babeloff.jnaerator; import org.gradle.api.Plugin; import org.gradle.api.Project; diff --git a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java b/jnaerator-gradle-plugin/src/main/java/babeloff/jnaerator/JNAeratorTask.java similarity index 98% rename from jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java rename to jnaerator-gradle-plugin/src/main/java/babeloff/jnaerator/JNAeratorTask.java index 4103ec56..2f6a77a0 100644 --- a/jnaerator-gradle-plugin/src/main/java/babeloff/JNAeratorTask.java +++ b/jnaerator-gradle-plugin/src/main/java/babeloff/jnaerator/JNAeratorTask.java @@ -1,4 +1,4 @@ -package babeloff; +package babeloff.jnaerator; import java.io.File; import java.io.IOException; diff --git a/jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties b/jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties index e9dc8292..987fe37e 100644 --- a/jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties +++ b/jnaerator-gradle-plugin/src/main/resources/META-INF/gradle-plugins/babeloff.jnaerator.properties @@ -1 +1 @@ -implementation-class=babeloff.JNAeratorPlugin \ No newline at end of file +implementation-class=babeloff.jnaerator.JNAeratorPlugin \ No newline at end of file