| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
| |
able to do a release build using the nightly build system
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1036 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1034 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
jogl_cg.dll
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1032 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
build of jogl.jar
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1030 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1001 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GlueGen runtime library (specifically the NativeLibrary class).
Updated the build.xml, in particular the dist targets, to no longer
build or copy this native library. Updated the NativeLibrary class to
allow specification of the full path to the library. Removed the
GlueGen runtime classes from jogl.jar; these are now expected to
reside in gluegen-rt.jar and it is expected that developers will have
this on their CLASSPATH. Updated the dist target to include the
gluegen-rt native library and jar file. Updated the JOGLAppletLauncher
to download and unpack the gluegen-rt-natives jar as well as the
jogl-natives jar. Updated the HowToBuild, user guide, and
JOGLAppletLauncher documentation for this restructuring. Fixed bug in
gluegen-cpptasks.xml in detection of Solaris/SPARCv9 and refactored
targets further. Tested on Solaris/x86 so far; further testing and
debugging of the nightly builds and applet launcher, and update of the
JOGL applet test, to follow.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@993 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@992 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed (?) Issue 227: Distinct naming for different versions of jogl
Fixed [No Issue Number]: Produce zip bundles from dist target
This set of build.xml changes addresses the issues listed above. The
"dist" target now puts the generated sources like GL.java into the
source archive it produces; it expects that these sources are copied
over from the Linux build. The kind of zip bundles that were produced
for JSR-231 1.0.0 are now the primary result from the "dist" target.
As these zip archives have unique version numbers, I believe these
changes also fix Issue 227, although it could probably be argued the
other way; please reopen this bug if the current changes are not
sufficient. These changes will take effect once the nightly build
machines are back on-line (they are currently being moved) and the
build scripts have been updated.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@983 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
invoke a build is now simply by calling "ant"
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@958 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@939 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@904 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
| |
gluegen-cpptasks.xml. Now JOGL and JOAL subclass these compiler and
linker definitions where necessary, resulting in much more code
sharing between the build.xml files. JOAL should now be ready to
compile on more platforms as well. Tested so far on Windows; will test
builds on other platforms.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@882 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
| |
any of the 32- or 64-bit Solaris targets; added isSolaris32Bit
property; revised dependent build.xml files
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@870 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
OS X universal binaries to be used on 10.3 as well; needs more testing
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@864 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
| |
GLJPanels when the Java2D/JOGL bridge is active on Mac OS X. This
required adding an alternate implementation for pbuffer drawables and
contexts on OS X which uses CGL rather than the NextStep OpenGL APIs.
Tested with advance Mustang bits on Mac OS X; Water and
HWShadowmapsSimple demos (which use pbuffers) are now working within
the JRefract harness when the Java2D/JOGL bridge is active.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@855 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
Officially adding Solaris AMD64 nightly builds. They should be
uploaded nightly beginning with tonight's nightly build. What will now
show up is a file called jogl-natives-solaris-amd64.jar
We have not really tested this much but will test extensively soon.
Modified Files:
make/build.xml
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@854 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@849 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
Adding support for 64 bit Solaris on AMD64. Make sure the 64 bit JVM is
in your path and it will build the 64 instead of the 32 target.
We are still having problems with this variant running properly in many
cases and I will file an issue.
I will putback the accompanying code in gluegen shortly.
Modified Files:
make/build.xml
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@809 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
| |
Add MacOSX fat (universal) to dist build. This should start being uploaded
nightly with tomorrow's nightly build -- jogl-natives-macosx-universal.jar
will be the filename.
Travis
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@792 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@788 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
| |
Issue 216: Cannot create GLCanvas on non-default GraphicsDevice
Made JOGL Xinerama-aware; now uses screen 0 rather than the screen
reported from the AWT GraphicsDevice when Xinerama is enabled. So far
only compiled and tested on non-Xinerama configuration on Linux; more
testing needed on Xinerama setups and on Solaris.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@782 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
Add sparcv9 architecture (64 bit SPARC) to nightly dist build.
Starting tonight, this will be available in the nightly build as
jogl-natives-solaris-sparcv9.jar. Enjoy.
Modified Files:
make/build.xml
----------------------------------------------------------------------
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@745 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
Add AMD64 native JOGL libraries to nightly build and nightly upload.
A file called "jogl-natives-linux-amd64.jar" should appear on jogl page
nightly from now on. I couldn't really test all the changes to our string
of scripts without updating all the builds right now, so hopefully
this will work OK, and if not, I'll fix in the morning.
Modified Files:
make/build.xml
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@743 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
| |
after receiving contributor agreement. Updated jogl's javadoc rules to
point to NativeTaglet in gluegen.jar.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@741 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
Add 64 bit Sparcv9 Solaris build. A concomitant change will be putback
into the gluegen tree shortly for properly detecting this case.
The way that gluegen checks 32 or 64 bit-ness is which java binary is in
your path, 32 bit sparc java or 64 bit sparcv9 java.
In order to build the jogl 64 bit target, you need to have installed the
64 bit OpenGL sparcv9 libraries.
This builds the JOGL binaries in the same place as the 32 bit JOGL .so
library builds binaries, so you can build one or the other with a given
source tree but not both.
The jogl.jar generated by either the 32 or 64 bit target it identical,
however.
I have not added the 64 bit target to the dist build, that is coming soon.
As well, it will be added to the nightly builds soon along with Linux AMD64
and Solaris AMD64.
Modified Files:
make/build.xml
----------------------------------------------------------------------
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@736 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
application in build.xml verbose.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@726 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
| |
and just update the manifest to promote an official build. Updated
joglRIversion to beta 4.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@725 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Incorporated patch from user cylab on javagaming.org forums to
generate @native tags in GL javadoc which are postprocessed using a
taglet:
http://www.javagaming.org/forums/index.php?topic=12629.0
Modified supplied patch to restrict the @native designation to only
the function name, and to understand OpenGL data type-related suffixes
(i.e., glVertex -> glVertex3f).
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@723 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
Change jogl-natives-solaris-sparc32.jar to jogl-natives-solaris-sparc.jar
Modified Files:
make/build.xml
----------------------------------------------------------------------
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@722 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
Modify dist build target. New nomenclature for jogl-native*.jar files
that distinguishes 32 and 64 bit targets. Starting tonight the nightly
build uploads will use the new nomenclature:
jogl-natives-solaris-sparc32.jar
jogl-natives-solaris-i586.jar
jogl-natives-linux-i586.jar
jogl-natives-windows-i586.jar
jogl-natives-macosx-ppc.jar
We will soon be uploading 64 bit targets, too.
Modified Files:
make/build.xml
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@716 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
on Windows 64-bit
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@715 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@713 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@682 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
of assembled jogl.jar and typo in gluegen's license file name
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@680 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
Couch causing packages like com.sun.opengl.impl.windows to be missed
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@679 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@649 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@621 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
| |
distributions using DRI drivers. Hacked around limitations of the
current DRI implementation by manually dlopen'ing libGL.so.1; avoids
changing glue code generation for core OpenGL 1.1 routines which do
not otherwise need to be called through function pointers on any
platform.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@614 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Reviewed by:
We are modifying the versioning for non-release builds. Now the timestamp
is part of the implementation version string. For instance,
"1.0.0-pre-20060215-17:03:32" is an implementation of the 1.0.0 version
of the API built on Feb. 15, 2006, at 5:03:32 PM. This is how our daily
build version strings will look. This is how the default build works.
Our official beta builds which are known as "stable" builds will have a
version string like: "1.0.0-beta3", etc.
Our final version of 1.0.0 implementation will become the "release" build
and the version string will be: 1.0.0
There are two easy ways to obtain the version string:
1) use the jogl.verbose properties flag (-Djogl.verbose) to see it at the
command line
2) use the java.lang.Package API to query it programatically. See example
in demos called demos/misc/VersionInfo
We are removing the Version utility class because it was insufficient for
a number of reasons. It should be removed with this putback.
I am not 100% positive that this does not break the JOGLAppletLauncher class
with the change that I have putback, but I can't test it here in my
environment. And I am pretty sure it will still work, but we will test it.
Modified Files:
src/classes/com/sun/opengl/util/JOGLAppletLauncher.java
make/joglversion make/build.xml make/joglRIversion
----------------------------------------------------------------------
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@612 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@606 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
| |
DebugGL pipeline. Fixed dependencies in JOGL and JOAL build.xml files
so that generated code gets automatically rebuilt if GlueGen is
updated.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@603 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Discovered it was necessary to re-attach the color and depth
renderbuffers to the FBO in JOGL's context, even though it shared
textures and display lists with Java2D's context; this may be a driver
problem and merits further investigation. Found it was also necessary
to create a new depth renderbuffer; apparently could not use Java2D's.
This is almost certainly a driver bug. At this point, with the
forthcoming planned changes to Mustang, JOGL works when
-Dsun.java2d.opengl.fbobject=true is specified. Problems remain with
the HWShadowmapsSimple (extremely slow performance) and
InfiniteShadowVolumes (throws exception because of inability to share
textures and display lists between pbuffer's context with stencil
buffer and Java2D's context) demos. Worked around earlier exceptions
with InfiniteShadowvolumes demo by avoiding sharing textures and
display lists with dummy GLContexts. Changed build to produce DebugGL
and TraceGL earlier so they can be used in e.g. GLJPanel.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@599 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
| |
may address problems on certain Linux distributions where for some
reason we're falling back to software rendering with Mesa
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@595 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
| |
bugs causing Linux natives to grow to huge size
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@588 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by: Travis
Modified Files:
make/build.xml
Added Files:
make/joglversion make/joglRIversion
We now prepend some version and implementation information to the manifest of
jogl.jar. This can be used to determine version information. I will put
back an example later today that prints out the version and implementation
information of any jogl.jar using this information using standard java.lang
APIs. The default build has this info as of right now:
Specification-Title: Java Bindings for OpenGL API Specification
Specification-Version: 1.0
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: Java Bindings for OpenGL Runtime Environment
Implementation-Version: 1.0 Beta2
Implementation-Vendor: java.net JOGL community
Extension-Name: javax.media.opengl
Implementation-Vendor-Id: com.sun
If built with the "RI flag" ==> "ant RI" which just sets a property and
then calls "ant all" then the manifest will read:
Specification-Title: Java Bindings for OpenGL API Specification
Specification-Version: 1.0
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: Java Bindings for OpenGL Runtime Environment
Implementation-Version: 1.0 Beta2
Implementation-Vendor: Sun Microsystems, Inc.
Extension-Name: javax.media.opengl
Implementation-Vendor-Id: com.sun
Whenever we change versions now, we will bump the Implementation-Version
field in the text files of joglversion and joglRIversion.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@575 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added com.sun.opengl.util.Gamma supporting adjusting of gamma,
brightness, and contrast. API and implementation derived from code in
the LWJGL project. Added demos.gamma.TestGamma demo illustrating how
to use the APIs. Tested on Linux, Mac OS X and Windows. No Solaris
support at this time, although future Solaris releases, being based on
the Xorg server, will probably have support for the required
XF86VidMode extension.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@557 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
| |
functions are specified. Now have their own header (which
unfortunately could not be placed in the macosx stub_includes
subdirectory due to build problems) in
make/stub_includes/opengl/macosx-window-system.h. Deleted manual
declarations for these functions from cgl-macosx.cfg.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@556 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Restructured JOGL and JOAL build processes to separately invoke
GlueGen's main build.xml before using it to generate their code.
Refactored OS/CPU detection code into gluegen-cpptasks.xml build file
in GlueGen workspace, which is now imported by both the JOGL and JOAL
build processes. Unfortunately it seems to be somewhat difficult to
completely factor out the C compiler configuration into the GlueGen
workspace so this has been left for a later date. Added missed
ALProcAddressLookup file to JOAL workspace. Updated JOGL and JOAL
build documentation. More documentation for the GlueGen workspace is
forthcoming.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@542 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
| |
of OS and CPU. Added default "all" target. It is now no longer
necessary to use the win32.vc6, etc. targets unless on Windows the
jogl.properties file is old and does not contain the win32.c.compiler
property. The nightly build setup will be adjusted for this and these
now-unnecessary targets will be deleted in a subsequent checkin.
Tested builds on Windows, Solaris and Mac OS X.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@540 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
| |
TextureIO-related classes to com.sun.opengl.util.texture and
TextureProvider, TextureWriter and format-specific readers to
com.sun.opengl.util.texture.spi. Renamed BufferUtils to BufferUtil.
Added ImageUtil and FileUtil. Cleaned up javadoc. Updated demos.
Cleaned up some imports.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@538 232f8b59-042b-4e1e-8c03-345bb8c30851
|