Skip to content
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.

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

fix: remove lint-related codes #266

Merged
merged 4 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
cd sc
git fetch --tags
# git checkout v2.8.5
git checkout -b test-branch a8a9995240eb51c11dfbadead4473d30eed79883
git checkout -b test-branch 3a6f67bb5f614e68bbc9852c2ef1cc1a9d96ea83

- name: Run bootstrap script
run: ./bootstrap
Expand Down
22 changes: 0 additions & 22 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST =
LDADD =
LINT_CSOURCES =
TESTS =
bin_PROGRAMS =
check_PROGRAMS =
Expand Down Expand Up @@ -78,27 +77,6 @@ include example/timings/Makefile.am
include example/balance/Makefile.am
include example/search/Makefile.am

## This was only used for our lint code, which needs to be replaced.
##
## # lint static syntax checker
## ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
## $(MPI_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
## $(src_libp4est_a_CPPFLAGS)
## lint:
## if LINT
## @for subdir in $(SUBDIRS) ; do \
## echo "Making $@ in $$subdir"; \
## (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
## done
## for f in $(LINT_CSOURCES) ; do \
## $(LINT) $(ALL_LINT_FLAGS) $(top_srcdir)/$$f || \
## echo "Lint check failed for $$f" ; \
## done
## else
## @echo "Static source code check disabled by configure"
## endif
## .PHONY: lint

# revision control and ChangeLog
ChangeLog:
(GIT_DIR=@top_srcdir@/.git git log > .ChangeLog.tmp && \
Expand Down
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ SC_MPI_CONFIG([P4EST], [], [])
SC_MPI_ENGAGE([P4EST])
# This is needed for compatibility with automake >= 1.12
m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
dnl SC_PROG_LINT
dnl SC_C_VERSION
LT_INIT

echo "o---------------------------------------"
Expand Down
6 changes: 0 additions & 6 deletions example/balance/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ example_balance_p4est_balance_seeds_SOURCES = \
example/balance/balance_seeds2.c
example_balance_p4est_balance_corner_SOURCES = \
example/balance/balance_corner2.c

LINT_CSOURCES += \
$(example_balance_p4est_balance_seeds_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -24,7 +21,4 @@ example_balance_p8est_balance_seeds_SOURCES = \
example/balance/balance_seeds3.c
example_balance_p8est_balance_corner_SOURCES = \
example/balance/balance_corner3.c

LINT_CSOURCES += \
$(example_balance_p8est_balance_seeds_SOURCES)
endif
4 changes: 0 additions & 4 deletions example/mesh/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
if P4EST_ENABLE_BUILD_2D
bin_PROGRAMS += example/mesh/p4est_mesh
example_mesh_p4est_mesh_SOURCES = example/mesh/mesh2.c

LINT_CSOURCES += $(example_mesh_p4est_mesh_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -16,6 +14,4 @@ bin_PROGRAMS += example/mesh/p8est_mesh \

example_mesh_p8est_mesh_SOURCES = example/mesh/mesh3.c
example_mesh_p8est_periodicity_SOURCES = example/mesh/periodicity3.c

LINT_CSOURCES += $(example_mesh_p8est_mesh_SOURCES)
endif
4 changes: 0 additions & 4 deletions example/particles/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ bin_PROGRAMS += \
example_particles_p4est_particles_SOURCES = \
example/particles/particles_global.h \
example/particles/particles2.c

LINT_CSOURCES += $(example_particles_p4est_particles_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -19,8 +17,6 @@ bin_PROGRAMS += \
example_particles_p8est_particles_SOURCES = \
example/particles/particles_global.h \
example/particles/particles3.c

LINT_CSOURCES += $(example_particles_p8est_particles_SOURCES)
endif

## from example/steps for future reference
Expand Down
4 changes: 0 additions & 4 deletions example/points/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ example_points_p4est_points_SOURCES = example/points/points2.c

bin_PROGRAMS += example/points/p4est_points_generate
example_points_p4est_points_generate_SOURCES = example/points/generate_points2.c

LINT_CSOURCES += $(example_points_p4est_points_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -19,6 +17,4 @@ example_points_p8est_points_SOURCES = example/points/points3.c

bin_PROGRAMS += example/points/p8est_points_generate
example_points_p8est_points_generate_SOURCES = example/points/generate_points3.c

LINT_CSOURCES += $(example_points_p8est_points_SOURCES)
endif
6 changes: 0 additions & 6 deletions example/search/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,11 @@ bin_PROGRAMS += example/search/p4est_count_quadrants

example_search_p4est_count_quadrants_SOURCES = \
example/search/count_quadrants2.c

LINT_CSOURCES += \
$(example_search_p4est_count_quadrants_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
bin_PROGRAMS += example/search/p8est_count_quadrants

example_search_p8est_count_quadrants_SOURCES = \
example/search/count_quadrants3.c

LINT_CSOURCES += \
$(example_search_p8est_count_quadrants_SOURCES)
endif
4 changes: 0 additions & 4 deletions example/simple/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@
if P4EST_ENABLE_BUILD_2D
bin_PROGRAMS += example/simple/p4est_simple
example_simple_p4est_simple_SOURCES = example/simple/simple2.c

LINT_CSOURCES += $(example_simple_p4est_simple_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
bin_PROGRAMS += example/simple/p8est_simple
example_simple_p8est_simple_SOURCES = example/simple/simple3.c

LINT_CSOURCES += $(example_simple_p8est_simple_SOURCES)
endif
4 changes: 0 additions & 4 deletions example/spheres/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ bin_PROGRAMS += \
example_spheres_p4est_spheres_SOURCES = \
example/spheres/spheres_global.h \
example/spheres/spheres2.c

LINT_CSOURCES += $(example_spheres_p4est_spheres_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -35,8 +33,6 @@ bin_PROGRAMS += \
example_spheres_p8est_spheres_SOURCES = \
example/spheres/spheres_global.h \
example/spheres/spheres3.c

LINT_CSOURCES += $(example_spheres_p8est_spheres_SOURCES)
endif

## from example/steps for future reference
Expand Down
14 changes: 1 addition & 13 deletions example/steps/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ example_steps_p4est_step2_SOURCES = example/steps/p4est_step2.c
example_steps_p4est_step3_SOURCES = example/steps/p4est_step3.c
example_steps_p4est_step4_SOURCES = example/steps/p4est_step4.c
example_steps_p4est_step5_SOURCES = example/steps/p4est_step5.c

LINT_CSOURCES += $(example_steps_p4est_step1_SOURCES) \
$(example_steps_p4est_step2_SOURCES) \
$(example_steps_p4est_step3_SOURCES) \
$(example_steps_p4est_step4_SOURCES) \
$(example_steps_p4est_step5_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -35,16 +29,10 @@ example_steps_p8est_step2_SOURCES = example/steps/p8est_step2.c
example_steps_p8est_step3_SOURCES = example/steps/p8est_step3.c
example_steps_p8est_step4_SOURCES = example/steps/p8est_step4.c
example_steps_p8est_step5_SOURCES = example/steps/p8est_step5.c

LINT_CSOURCES += $(example_steps_p8est_step1_SOURCES) \
$(example_steps_p8est_step2_SOURCES) \
$(example_steps_p8est_step3_SOURCES) \
$(example_steps_p8est_step4_SOURCES) \
$(example_steps_p8est_step5_SOURCES)
endif

EXTRA_DIST += \
example/steps/hw32.h
example/steps/hw32.h

dist_p4estdata_DATA += \
example/steps/hole_2d_cubit.inp \
Expand Down
7 changes: 0 additions & 7 deletions example/tetgen/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ bin_PROGRAMS += \
example/tetgen/p4est_write_conn example/tetgen/p4est_read_conn
example_tetgen_p4est_write_conn_SOURCES = example/tetgen/write_conn2.c
example_tetgen_p4est_read_conn_SOURCES = example/tetgen/read_conn2.c

LINT_CSOURCES += $(example_tetgen_p4est_write_conn_SOURCES) \
$(example_tetgen_p4est_read_conn_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -24,8 +21,4 @@ bin_PROGRAMS += \
example_tetgen_p8est_write_conn_SOURCES = example/tetgen/write_conn3.c
example_tetgen_p8est_read_conn_SOURCES = example/tetgen/read_conn3.c
example_tetgen_p8est_read_tetgen_SOURCES = example/tetgen/read_tetgen.c

LINT_CSOURCES += $(example_tetgen_p8est_write_conn_SOURCES) \
$(example_tetgen_p8est_read_conn_SOURCES) \
$(example_tetgen_p8est_read_tetgen_SOURCES)
endif
11 changes: 0 additions & 11 deletions example/timings/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ bin_PROGRAMS += \
example_timings_p4est_timings_SOURCES = example/timings/timings2.c
example_timings_p4est_bricks_SOURCES = example/timings/bricks2.c
example_timings_p4est_loadconn_SOURCES = example/timings/loadconn2.c

LINT_CSOURCES += \
$(example_timings_p4est_timings_SOURCES) \
$(example_timings_p4est_bricks_SOURCES) \
$(example_timings_p4est_loadconn_SOURCES)
endif

if P4EST_ENABLE_BUILD_3D
Expand All @@ -30,12 +25,6 @@ example_timings_p8est_timings_SOURCES = example/timings/timings3.c
example_timings_p8est_bricks_SOURCES = example/timings/bricks3.c
example_timings_p8est_loadconn_SOURCES = example/timings/loadconn3.c
example_timings_p8est_tsearch_SOURCES = example/timings/tsearch3.c

LINT_CSOURCES += \
$(example_timings_p8est_timings_SOURCES) \
$(example_timings_p8est_bricks_SOURCES) \
$(example_timings_p8est_loadconn_SOURCES) \
$(example_timings_p8est_tsearch_SOURCES)
endif

EXTRA_DIST += example/timings/timana.awk example/timings/timana.sh
2 changes: 0 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,3 @@ nodist_include_HEADERS += $(libp4est_generated_headers)
include_HEADERS += $(libp4est_installed_headers)

AM_CPPFLAGS += -I@top_srcdir@/src @P4EST_SC_CPPFLAGS@

LINT_CSOURCES += $(libp4est_compiled_sources)
4 changes: 0 additions & 4 deletions src/p4est_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ p4est_get_package_id (void)
#undef P4EST_LERRORF
#endif

#ifndef SC_SPLINT

void
P4EST_GLOBAL_LOGF (int priority, const char *fmt, ...)
{
Expand Down Expand Up @@ -165,5 +163,3 @@ p4est_version_minor (void)
/* In rare cases SC_VERSION_MAJOR may be a non-numerical string */
return sc_atoi (SC_TOSTRING (P4EST_VERSION_MINOR));
}

#endif
73 changes: 0 additions & 73 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -166,76 +166,3 @@ endif
endif

TESTS += $(p4est_test_programs)

LINT_CSOURCES += \
$(test_p4est_test_comm_SOURCES) \
$(test_p4est_test_hash_SOURCES) \
$(test_p4est_test_quadrants_SOURCES) \
$(test_p4est_test_balance_SOURCES) \
$(test_p4est_test_partition_SOURCES) \
$(test_p4est_test_order_SOURCES) \
$(test_p4est_test_coarsen_SOURCES) \
$(test_p4est_test_valid_SOURCES) \
$(test_p4est_test_balance_type_SOURCES) \
$(test_p4est_test_loadsave_SOURCES) \
$(test_p4est_test_load_SOURCES) \
$(test_p4est_test_ghost_SOURCES) \
$(test_p4est_test_mesh_bijective_SOURCES) \
$(test_p4est_test_conn_transformation_SOURCES) \
$(test_p4est_test_iterate_SOURCES) \
$(test_p4est_test_lnodes_SOURCES) \
$(test_p4est_test_search_SOURCES) \
$(test_p4est_test_complete_subtree_SOURCES) \
$(test_p4est_test_brick_SOURCES) \
$(test_p4est_test_partition_corr_SOURCES) \
$(test_p4est_test_reorder_SOURCES) \
$(test_p4est_test_balance_seeds_SOURCES) \
$(test_p4est_test_wrap_SOURCES) \
$(test_p4est_test_replace_SOURCES) \
$(test_p4est_test_join_SOURCES) \
$(test_p4est_test_conn_reduce_SOURCES) \
$(test_p4est_test_plex_SOURCES) \
$(test_p4est_test_connrefine_SOURCES) \
$(test_p4est_test_subcomm_SOURCES) \
$(test_p4est_test_nodes_SOURCES) \
$(test_p4est_test_version_SOURCES) \
$(test_p4est_test_io_SOURCES) \
$(test_p8est_test_quadrants_SOURCES) \
$(test_p8est_test_balance_SOURCES) \
$(test_p8est_test_partition_SOURCES) \
$(test_p8est_test_coarsen_SOURCES) \
$(test_p8est_test_valid_SOURCES) \
$(test_p8est_test_balance_type_SOURCES) \
$(test_p8est_test_face_transform_SOURCES) \
$(test_p8est_test_edge_face_corners_SOURCES) \
$(test_p8est_test_periodic_SOURCES) \
$(test_p8est_test_loadsave_SOURCES) \
$(test_p8est_test_load_SOURCES) \
$(test_p8est_test_ghost_SOURCES) \
$(test_p8est_test_corners_SOURCES) \
$(test_p8est_test_mesh_bijective_SOURCES) \
$(test_p8est_test_conn_transformation_SOURCES) \
$(test_p8est_test_brick_SOURCES) \
$(test_p8est_test_iterate_SOURCES) \
$(test_p8est_test_lnodes_SOURCES) \
$(test_p8est_test_search_SOURCES) \
$(test_p8est_test_reorder_SOURCES) \
$(test_p8est_test_partition_corr_SOURCES) \
$(test_p8est_test_balance_seeds_SOURCES) \
$(test_p8est_test_wrap_SOURCES) \
$(test_p8est_test_replace_SOURCES) \
$(test_p8est_test_join_SOURCES) \
$(test_p8est_test_conn_reduce_SOURCES) \
$(test_p8est_test_plex_SOURCES) \
$(test_p8est_test_connrefine_SOURCES) \
$(test_p8est_test_subcomm_SOURCES) \
$(test_p8est_test_nodes_SOURCES) \
$(test_p8est_test_version_SOURCES) \
$(test_p8est_test_io_SOURCES) \
$(test_p6est_test_all_SOURCES)

if P4EST_WITH_METIS
LINT_CSOURCES += \
$(test_p4est_test_reorder_SOURCES) \
$(test_p8est_test_reorder_SOURCES)
endif