Skip to content

Evio 6 dev #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonzarling merged 4 commits into from
Jul 9, 2025
Merged

Evio 6 dev #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7e6bb9
Add jar files, cleanup maven pom.xml
jonzarling Jul 9, 2025
66eb9c4
Fix C standard (not just C++), bump versions for next release.
jonzarling Jul 9, 2025
288b8a4
Bump C++ standard to 20
jonzarling Jul 9, 2025
2ffdb27
Final cleanup before new version tag
jonzarling Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
cmake_minimum_required(VERSION 3.22)
project(evio VERSION 6.0 LANGUAGES C CXX)
project(evio VERSION 6.1.0 LANGUAGES C CXX)

# Build options (and defaults)
option(C_ONLY "SKIP building C++ library, build C only" OFF)
option(MAKE_EXAMPLES "Build example/test programs" OFF)
option(USE_FILESYSTEMLIB "Use C++17 <filesystem> instead of Boost" OFF)
option(DISRUPTOR_FETCH "Allow CMake to download Disruptor if not found" ON)
# C/C++ standard and build options
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_DEBUG_POSTFIX -dbg)
add_compile_options(-Wall)

# Build options (and defaults)
option(C_ONLY "SKIP building C++ library, build C only" OFF)
option(MAKE_EXAMPLES "Build example/test programs" OFF)
option(USE_FILESYSTEMLIB "Use C++ <filesystem> instead of Boost" OFF)
option(DISRUPTOR_FETCH "Allow CMake to download Disruptor if not found" ON)
include(GNUInstallDirs)
include(FindPackageHandleStandardArgs) # find_package_handle_standard_args()
include(CTest)
Expand Down Expand Up @@ -222,7 +224,7 @@ if(DOXYGEN_FOUND)

# Add target of "docC"
doxygen_add_docs(docC src/libsrc COMMENT "Generating Doxygen documentation for C")
elseif(NOT C_ONLY)
else()
message(WARNING "Doxygen NOT found, documentation will not be generated")
endif()

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Software Library Documentation:

Other Links:
* [EVIO Event Viewer on GitHub](https://github.com/JeffersonLab/JEventViewer)
* [pyevio: Python Based EVIO parser](https://github.com/JeffersonLab/pyevio)


The EVIO-6 data format is closely related to the HIPO data format, following the same data
Expand Down
Binary file added java/jars/jevio-6.0.0-jar-with-dependencies.jar
View file
Open in desktop
Binary file not shown.
Binary file added java/jars/jevio-6.0.0.jar
View file
Open in desktop
Binary file not shown.
31 changes: 5 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.coda</groupId>
<artifactId>jevio</artifactId>
<version>6.0.0</version>
<version>6.1.0</version> <!-- JEVIO version tag -->
<name>Jefferson Lab EVIO Java Library (JEVIO)</name>
<description>Java library for EVIO (Event Input/Output)</description>
<packaging>jar</packaging>
Expand All @@ -13,7 +13,7 @@
<!-- SOFTWARE VERSIONS USED -->
<properties>
<!-- Set Java version -->
<java.version>15</java.version> <!-- Compatibility: if Java 8 desired, put 1.8 here (not 8) -->
<java.version>17</java.version> <!-- Compatibility: if Java 8 desired, put 1.8 here (not 8) -->
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<!-- Dependencies (versions for jars we'll need to bring in) -->
Expand Down Expand Up @@ -42,6 +42,8 @@
<version>${lz4.version}</version>
</dependency>
<!-- LMAX Disruptor (for ring buffer concurrency) -->
<!-- WARNING: we're assuming it finds the java/jars folder with the JLab forked version -->
<!-- else it will try to download from generic maven repo and fail! -->
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
Expand All @@ -58,7 +60,6 @@


<build>
<!-- <sourceDirectory>${project.basedir}/java</sourceDirectory> -->
<plugins>

<!-- Install disruptor jar -->
Expand All @@ -85,33 +86,11 @@
</executions>
</plugin>

<!-- Add sources in non-standard folder setup -->
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>add-jevio-tests</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>etc/java/org/jlab/coda/jevio/test</source>
</sources>
</configuration>
</execution>
</executions>
</plugin> -->

<!-- Make the fat jar file -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version> <!-- upgrade to latest -->
<version>3.6.0</version>
<configuration>
<!-- <appendAssemblyId>false</appendAssemblyId> -->
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
Expand Down
45 changes: 0 additions & 45 deletions src/main/java/org/jlab/coda/jevio/dev/EvioReadFileSimple.java
View file
Open in desktop

This file was deleted.