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.

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

Jump to bottom

Change BlackBear APPLICATION_NAME to black_bear #384

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
+7 −7
Open

Change BlackBear APPLICATION_NAME to black_bear #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,4 @@ python/peacock/tests/postprocessor_tab/TestPostprocessorPluginManager_test_scrip
!python/peacock/tests/**/input/*.*

build
blackbear.yaml
black_bear.yaml
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ BLACKBEAR_DIR := $(CURDIR)

# dep apps
APPLICATION_DIR := $(CURDIR)
APPLICATION_NAME := blackbear
APPLICATION_NAME := black_bear
BUILD_EXEC := yes
DEP_APPS := $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
include $(FRAMEWORK_DIR)/app.mk
Expand Down
0 blackbear.mk → black_bear.mk
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion contrib/neml.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ neml_LIB := $(NEML_DIR)/libneml-$(METHOD).la
neml_includes := $(NEML_DIR)/include
neml_dep_includes := -iquote$(NEML_DIR)/rapidxml -iquote$(BLACKBEAR_DIR)/contrib/neml_extra_include

$(APPLICATION_DIR)/lib/libblackbear-$(METHOD).la: $(neml_LIB)
$(APPLICATION_DIR)/lib/libblack_bear-$(METHOD).la: $(neml_LIB)

$(neml_LIB): $(neml_objects)
@echo "Linking Library "$@"..."
Expand Down
2 changes: 1 addition & 1 deletion run_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ MOOSE_DIR = os.environ.get('MOOSE_DIR', MOOSE_DIR)
sys.path.append(os.path.join(MOOSE_DIR, 'python'))

from TestHarness import TestHarness
TestHarness.buildAndRun(sys.argv, 'blackbear', MOOSE_DIR)
TestHarness.buildAndRun(sys.argv, 'black_bear', MOOSE_DIR)
2 changes: 1 addition & 1 deletion src/base/BlackBearApp.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ BlackBearApp::runInputFile()
}

static void
associateSyntaxInner(Syntax & syntax, ActionFactory & /*action_factory*/)
associateSyntaxInner(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
{
}

Expand Down
4 changes: 2 additions & 2 deletions unit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ ADDITIONAL_LIBS := $(FRAMEWORK_DIR)/contrib/gtest/libgtest.la
# dep apps
CURRENT_DIR := $(shell pwd)
APPLICATION_DIR := $(CURRENT_DIR)/..
APPLICATION_NAME := blackbear
APPLICATION_NAME := black_bear
include $(FRAMEWORK_DIR)/app.mk

APPLICATION_DIR := $(CURRENT_DIR)
APPLICATION_NAME := blackbear-unit
APPLICATION_NAME := black_bear-unit
BUILD_EXEC := yes

DEP_APPS ?= $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
Expand Down