diff options
| -rw-r--r-- | make/build.xml | 84 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 77 | ||||
| -rw-r--r-- | make/lib/cdc_fp.LICENSE.txt | 352 | ||||
| -rwxr-xr-x | make/lib/cdc_fp.jar | bin | 1494529 -> 0 bytes | |||
| -rwxr-xr-x | make/stub_includes/macosx/dynamic-linker.h | 16 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/jvm/JNILibLoaderBase.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/jvm/JVMUtil.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/ReflectionUtil.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/locks/Lock.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/locks/RecursiveLock.java | 2 | ||||
| -rw-r--r-- | src/java/jogamp/common/Debug.java (renamed from src/java/com/jogamp/common/impl/Debug.java) | 2 |
11 files changed, 54 insertions, 487 deletions
diff --git a/make/build.xml b/make/build.xml index f4fcdc8..aecfbe0 100644 --- a/make/build.xml +++ b/make/build.xml @@ -38,10 +38,8 @@ <target name="init" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os,setup-excludes-1,setup-excludes-2"> <!-- Declare all paths and user defined variables. --> - <property name="javac.bootclasspath-cdc.jar" value="lib/cdc_fp.jar" /> - - <!--property name="javadoc.link" value="http://download.oracle.com/javase/1.4.2/docs/api/"/--> - <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /> + <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /--> + <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /> <!-- The source and build directories. --> <property name="project.root" value=".." /> @@ -68,20 +66,16 @@ <!-- The generated source directories. --> <property name="src.generated" value="${build}/gensrc" /> <property name="src.generated.java" value="${src.generated}/java" /> - <property name="src.generated.java-cdc" value="${src.generated}/java-cdc" /> <!-- The compiler output directories. --> <property name="classes" value="${build}/classes" /> - <property name="classes-cdc" value="${build}/classes-cdc" /> <!-- Call the external config validator script to make sure the config is ok and consistent --> <ant antfile="validate-properties.xml" inheritall="true"/> <!-- Create the required output directories. --> <mkdir dir="${src.generated.java}" /> - <mkdir dir="${src.generated.java-cdc}" /> <mkdir dir="${classes}" /> - <mkdir dir="${classes-cdc}" /> <!-- Create the classpath for ANTLR. This requires the user-defined - "antlr.jar" property. --> @@ -430,29 +424,6 @@ <antcall target="c.manifest" inheritRefs="true" /> </target> - <target name="gluegen.build.gluegen-rt.cdc" > - <!-- Build just the gluegen-rt.cdc.jar classes using the Java CDC - boot classes --> - <copy todir="${classes-cdc}"> - <fileset dir="${classes}" - includes="com/** net/**" - excludes="com/jogamp/gluegen/runtime/** com/jogamp/gluegen/test/**" /> - </copy> - - <!-- bootclasspath="${javac.bootclasspath-cdc.jar}"--> - <javac destdir="${classes-cdc}" - source="1.4" - debug="true" - debuglevel="source,lines,vars" - includeAntRuntime="false" - excludes="${gluegen.excludes}" - > - <src path="${src.java}" /> - <src path="${src.generated.java-cdc}" /> - <classpath refid="antlr.classpath" /> - </javac> - </target> - <!-- ================================================================== --> <!-- - Build GlueGen. @@ -582,9 +553,9 @@ <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> <property name="jogamp.common.classes" value="com/jogamp/common/**"/> - <!--compile gluegen-rt with source=1.4 first--> + <!--compile gluegen-rt with source=1.5 first--> <javac destdir="${classes}" - source="1.4" + source="1.5" debug="true" debuglevel="source,lines,vars" includeAntRuntime="false" @@ -636,19 +607,8 @@ </filterset> </copy> - <copy file="Manifest-rt.cdc" - tofile="${build}/Manifest-rt.cdc.temp" - overwrite="true"> - <filterset> - <filter token="VERSION" value="${gluegen.version}"/> - <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> - <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> - <filter token="BASEVERSION" value="${gluegen_base_version}"/> - </filterset> - </copy> - <!-- Build the (native code) NativeLibrary support for - gluegen-rt[-cdc].jar using the just-built GlueGen. --> + gluegen-rt.jar using the just-built GlueGen. --> <antcall target="c.build" inheritRefs="true" /> <!-- Build gluegen-rt.jar. --> @@ -656,6 +616,7 @@ <fileset dir="${classes}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/common/**" /> + <include name="jogamp/common/**" /> </fileset> </jar> <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifest="${build}/Manifest-rt.temp"> @@ -664,30 +625,6 @@ </fileset> </jar> - <!-- Build just the gluegen-rt.cdc.jar classes using the Java CDC - boot classes. --> - <antcall target="gluegen.build.gluegen-rt.cdc" inheritRefs="true" /> - - <!-- Build gluegen-rt.cdc.jar. --> - <jar destfile="${build}/gluegen-rt.cdc.jar" manifest="${build}/Manifest-rt.cdc.temp"> - <fileset dir="${classes-cdc}"> - <include name="com/jogamp/gluegen/runtime/*.class" /> - <include name="com/jogamp/common/impl/*.class" /> - <include name="com/jogamp/common/jvm/*.class" /> - <include name="com/jogamp/common/type/*.class" /> - <include name="com/jogamp/common/util/*.class" /> - <include name="com/jogamp/common/util/locks/*.class" /> - <include name="com/jogamp/common/nio/*.class" /> - <include name="com/jogamp/common/os/*.class" /> - <include name="com/jogamp/common/*.class" /> - </fileset> - </jar> - <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}-cdc.jar" manifest="${build}/Manifest-rt.cdc.temp"> - <fileset dir="${build}/obj"> - <include name="*gluegen-rt.${native.library.suffix-cdc}" /> - </fileset> - </jar> - <!-- Copy antlr.jar into build directory for convenience so gluegen.jar can be run via "java -jar". antlr.jar is referenced via a Class-Path entry in the Manifest of @@ -743,7 +680,6 @@ maxmemory="256m" > <classpath path="${classes}"/> <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" /> - <excludepackage name="com.jogamp.common.impl"/> </javadoc> <zip destfile="${build}/javadoc.zip" basedir="${javadoc.root.path}" @@ -876,14 +812,6 @@ <param name="artifactId" value="gluegen-rt-natives"/> <param name="description" value="GlueGen runtime native libraries for ${os.and.arch}"/> </antcall> - <!--<antcall target="maven.${mvn.task}.artifact" inheritall="true">--> - <!--<param name="artifactId" value="gluegen-rt-cdc"/>--> - <!--<param name="description" value="Gluegen CDC Runtime"/>--> - <!--</antcall>--> - <!--<antcall target="maven.${mvn.task}.artifact" inheritall="true">--> - <!--<param name="artifactId" value="gluegen-rt-natives-cdc"/>--> - <!--<param name="description" value="Gluegen CDC runtime native libraries for ${os.and.arch}"/>--> - <!--</antcall>--> </target> <target name="maven.install" depends="init, gluegen.build"> diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index d0e6b9a..b967a91 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -185,7 +185,7 @@ <condition property="isWindowsAMD64"> <and> <istrue value="${isWindows}" /> - <os arch="amd64" /> + <os arch="amd64" /> </and> </condition> <condition property="isFreeBSDX86"> @@ -350,7 +350,6 @@ <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> <property name="native.library.suffix" value="*lib" /> - <property name="native.library.suffix-cdc" value="so" /> <property name="os.and.arch" value="macosx-universal" /> </target> @@ -374,7 +373,6 @@ <target name="gluegen.cpptasks.detect.os.unix" unless="gluegen.cpptasks.detected.os.2" if="isUnix"> <property name="native.library.suffix" value="so" /> - <property name="native.library.suffix-cdc" value="so" /> </target> <target name="gluegen.cpptasks.detect.os.windows.amd64" unless="gluegen.cpptasks.detected.os.2" if="isWindowsAMD64"> @@ -387,7 +385,6 @@ <target name="gluegen.cpptasks.detect.os.windows" depends="gluegen.cpptasks.detect.os.windows.amd64,gluegen.cpptasks.detect.os.windows.x86" unless="gluegen.cpptasks.detected.os.2" if="isWindows"> <property name="native.library.suffix" value="dll" /> - <property name="native.library.suffix-cdc" value="dll" /> </target> <target name="gluegen.cpptasks.detect.os.2" depends="gluegen.cpptasks.detect.os.freebsd,gluegen.cpptasks.detect.os.hpux,gluegen.cpptasks.detect.os.linux,gluegen.cpptasks.detect.os.osx,gluegen.cpptasks.detect.os.solaris,gluegen.cpptasks.detect.os.unix,gluegen.cpptasks.detect.os.windows" unless="gluegen.cpptasks.detected.os.2"> @@ -607,37 +604,33 @@ </defineset> </compiler> -<!-- - SOLARIS is currently disabled .. - - <compiler id="compiler.cfg.solaris" name="suncc"> - <defineset> - <define name="SOLARIS" /> - </defineset> + <!-- SOLARIS compiler configuration --> + + <compiler id="compiler.cfg.solaris" name="gcc"> + <defineset> + <define name="SOLARIS" /> + </defineset> + </compiler> + + <compiler id="compiler.cfg.solaris.sparcv9" name="gcc"> + <compilerarg value="-fast" /> + <compilerarg value="-xchip=ultra" /> + <compilerarg value="-xarch=v9a" /> + <defineset> + <define name="SOLARIS" /> + </defineset> + </compiler> + + <compiler id="compiler.cfg.solaris.amd64" name="gcc"> + <compilerarg value="-fast" /> + <compilerarg value="-xchip=opteron" /> + <compilerarg value="-xarch=amd64" /> + <compilerarg value="-xcache=64/64/2:1024/64/16" /> + <defineset> + <define name="SOLARIS" /> + </defineset> </compiler> - <compiler id="compiler.cfg.solaris.sparcv9" name="suncc"> - <compilerarg value="-fast" /> - <compilerarg value="-xchip=ultra" /> - <compilerarg value="-xarch=v9a" /> - <defineset> - <define name="SOLARIS" /> - </defineset> - </compiler> - - <compiler id="compiler.cfg.solaris.amd64" name="suncc"> - <compilerarg value="-fast" /> - <compilerarg value="-xchip=opteron" /> - <compilerarg value="-xarch=amd64" /> - --> - <!-- <compilerarg value="-xcache=64/64/2:1024/64/16" /> --> -<!-- - <defineset> - <define name="SOLARIS" /> - </defineset> - </compiler> - --> - <!-- MacOSX compiler configuration --> <compiler id="compiler.cfg.macosx" name="gcc"> @@ -755,20 +748,18 @@ <linkerarg value="-m64"/> </linker> -<!-- - SOLARIS is currently unsupported + <!-- SOLARIS linker configuration --> - <linker id="linker.cfg.solaris" name="suncc"> - </linker> + <linker id="linker.cfg.solaris" name="gcc"> + </linker> - <linker id="linker.cfg.solaris.sparcv9" name="suncc"> - <linkerarg value="-xarch=v9a" /> - </linker> + <linker id="linker.cfg.solaris.sparcv9" name="gcc"> + <linkerarg value="-xarch=v9a" /> + </linker> - <linker id="linker.cfg.solaris.amd64" name="suncc"> - <linkerarg value="-xarch=amd64" /> + <linker id="linker.cfg.solaris.amd64" name="gcc"> + <linkerarg value="-xarch=amd64" /> </linker> ---> <!-- MacOSX linker configuration --> diff --git a/make/lib/cdc_fp.LICENSE.txt b/make/lib/cdc_fp.LICENSE.txt deleted file mode 100644 index c09f6d9..0000000 --- a/make/lib/cdc_fp.LICENSE.txt +++ /dev/null @@ -1,352 +0,0 @@ -Project Website incl source code: https://phoneme.dev.java.net/ - -The GNU General Public License (GPL) - Version 2, June 1991 - - Copyright 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - -The licenses for most software are designed to take away your freedom -to share and change it. By contrast, the GNU General Public License is -intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - -We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, -we want its recipients to know that what they have is not the -original, so that any problems introduced by others will not reflect -on the original authors' reputations. - -Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at -all. - -The precise terms and conditions for copying, distribution and -modification follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a -notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the Program -(independent of having been made by running the Program). Whether that -is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source -code as you receive it, in any medium, provided that you conspicuously -and appropriately publish on each copy an appropriate copyright notice -and disclaimer of warranty; keep intact all the notices that refer to -this License and to the absence of any warranty; and give any other -recipients of the Program a copy of this License along with the -Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a -fee. - -2. You may modify your copy or copies of the Program or any portion of -it, thus forming a work based on the Program, and copy and distribute -such modifications or work under the terms of Section 1 above, -provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the - Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software - interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt otherwise -to copy, modify, sublicense or distribute the Program is void, and -will automatically terminate your rights under this License. However, -parties who have received copies, or rights, from you under this -License will not have their licenses terminated so long as such -parties remain in full compliance. - -5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted -herein. You are not responsible for enforcing compliance by third -parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new -versions of the General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Program does not specify a -version number of this License, you may choose any version ever -published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the -author to ask for permission. For software which is copyrighted by the -Free Software Foundation, write to the Free Software Foundation; we -sometimes make exceptions for this. Our decision will be guided by the -two goals of preserving the free status of all derivatives of our free -software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE -LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS -AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF -ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these -terms. - -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA - -Also add information on how to contact you by electronic and paper -mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to - redistribute it under certain conditions; type `show c' for - details. - -The hypothetical commands `show w' and `show c' should show the -appropriate parts of the General Public License. Of course, the -commands you use may be called something other than `show w' and `show -c'; they could even be mouse-clicks or menu items--whatever suits your -program. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the program, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, -you may consider it more useful to permit linking proprietary -applications with the library. If this is what you want to do, use the -GNU Library General Public License instead of this License. - diff --git a/make/lib/cdc_fp.jar b/make/lib/cdc_fp.jar Binary files differdeleted file mode 100755 index ada2e3b..0000000 --- a/make/lib/cdc_fp.jar +++ /dev/null diff --git a/make/stub_includes/macosx/dynamic-linker.h b/make/stub_includes/macosx/dynamic-linker.h index 11afcdc..a3c2f8d 100755 --- a/make/stub_includes/macosx/dynamic-linker.h +++ b/make/stub_includes/macosx/dynamic-linker.h @@ -25,8 +25,8 @@ /* Based on the dlcompat work done by: - Jorge Acereda <[email protected]> & - Peter O'Gorman <[email protected]> + Jorge Acereda <[email protected]> & + Peter O'Gorman <[email protected]> */ extern int dlclose(void * __handle); @@ -34,13 +34,13 @@ extern char * dlerror(void); extern void * dlopen(const char * __path, int __mode); extern void * dlsym(void * __handle, const char * __symbol); -#define RTLD_LAZY 0x1 -#define RTLD_NOW 0x2 -#define RTLD_LOCAL 0x4 -#define RTLD_GLOBAL 0x8 +#define RTLD_LAZY 0x1 +#define RTLD_NOW 0x2 +#define RTLD_LOCAL 0x4 +#define RTLD_GLOBAL 0x8 /* * Special handle arguments for dlsym(). */ -#define RTLD_NEXT -1LL /* Search subsequent objects. */ -#define RTLD_DEFAULT -2LL /* Use default search algorithm. */ +#define RTLD_NEXT -1LL /* Search subsequent objects. */ +#define RTLD_DEFAULT -2LL /* Use default search algorithm. */ diff --git a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java index e80c225..cbc5959 100644 --- a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java +++ b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java @@ -46,7 +46,7 @@ import java.lang.reflect.Method; import java.security.AccessController; import java.security.AccessControlContext; import java.util.HashSet; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; public class JNILibLoaderBase { public static final boolean DEBUG = Debug.debug("JNILibLoader"); diff --git a/src/java/com/jogamp/common/jvm/JVMUtil.java b/src/java/com/jogamp/common/jvm/JVMUtil.java index 833e907..fda7f74 100644 --- a/src/java/com/jogamp/common/jvm/JVMUtil.java +++ b/src/java/com/jogamp/common/jvm/JVMUtil.java @@ -34,7 +34,7 @@ package com.jogamp.common.jvm; import java.nio.ByteBuffer; import com.jogamp.common.nio.Buffers; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; import com.jogamp.gluegen.runtime.NativeLibLoader; /** diff --git a/src/java/com/jogamp/common/util/ReflectionUtil.java b/src/java/com/jogamp/common/util/ReflectionUtil.java index a04a160..c6b1b88 100644 --- a/src/java/com/jogamp/common/util/ReflectionUtil.java +++ b/src/java/com/jogamp/common/util/ReflectionUtil.java @@ -39,7 +39,7 @@ package com.jogamp.common.util; import java.lang.reflect.*; import com.jogamp.common.JogampRuntimeException; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; public final class ReflectionUtil { diff --git a/src/java/com/jogamp/common/util/locks/Lock.java b/src/java/com/jogamp/common/util/locks/Lock.java index 7065ff8..4ea8bf4 100644 --- a/src/java/com/jogamp/common/util/locks/Lock.java +++ b/src/java/com/jogamp/common/util/locks/Lock.java @@ -28,7 +28,7 @@ package com.jogamp.common.util.locks; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; import java.security.AccessController; /** diff --git a/src/java/com/jogamp/common/util/locks/RecursiveLock.java b/src/java/com/jogamp/common/util/locks/RecursiveLock.java index de61451..4f8415e 100644 --- a/src/java/com/jogamp/common/util/locks/RecursiveLock.java +++ b/src/java/com/jogamp/common/util/locks/RecursiveLock.java @@ -28,7 +28,7 @@ package com.jogamp.common.util.locks; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; import java.security.AccessController; import java.util.LinkedList; diff --git a/src/java/com/jogamp/common/impl/Debug.java b/src/java/jogamp/common/Debug.java index d8412ae..e425e9c 100644 --- a/src/java/com/jogamp/common/impl/Debug.java +++ b/src/java/jogamp/common/Debug.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.common.impl; +package jogamp.common; import java.security.*; |