Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/RuleWorld/bionetgen
Browse files Browse the repository at this point in the history
  • Loading branch information
jrfaeder committed Mar 15, 2024
2 parents 325fba1 + eaf3b82 commit 06d5f6f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
generators: "Ninja"
}
steps:
- name: Checkout repo and submodules
- name: Checkout repo # and submodules
uses: actions/checkout@v2
with:
submodules: recursive
Expand Down
12 changes: 7 additions & 5 deletions bng2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ NFSIM_DIR = nfsim_src
.PHONY: clean test


all: $(NFSIM_BIN) $(NETWORK_BIN)
#all: $(NFSIM_BIN) $(NETWORK_BIN)
all: $(NETWORK_BIN)

dist: $(DIST_TARBALL)

$(DIST_TARBALL): $(DIST_DIR)
tar czf $(DIST_TARBALL) $(DIST_DIR)

$(DIST_DIR): $(NFSIM_BIN) $(NETWORK_BIN)
#$(DIST_DIR): $(NFSIM_BIN) $(NETWORK_BIN)
$(DIST_DIR): $(NETWORK_BIN)
mkdir -p $(DIST_DIR)
cd $(NETWORK_DIR); cp -fr lib include ../$(DIST_DIR)
cp -fr bin BNG2.pl CHANGES.txt CREDITS.txt Models2 Perl2 Network3 Validate VERSION $(DIST_DIR)
Expand All @@ -41,9 +43,9 @@ $(NFSIM_BIN):
clean:
rm -fr $(DIST_DIR)
rm -fr $(DIST_TARBALL)
cd $(NFSIM_DIR) ; $(MAKE) clean
#cd $(NFSIM_DIR) ; $(MAKE) clean
cd $(NETWORK_DIR) ; $(MAKE) clean
cd $(GROUP_BINDIR); rm $(NETWORK_BIN); rm $(NFSIM_BIN)

test: $(NFSIM_BIN) $(NETWORK_BIN)
cd Validate; perl validate_examples.pl
#test: $(NFSIM_BIN) $(NETWORK_BIN)
# cd Validate; perl validate_examples.pl

0 comments on commit 06d5f6f

Please sign in to comment.