OSDN Git Service

(root) / eos / base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 75f95e3)
Please enter the commit message for your changes. Lines starting
authorTakuo Yasunaga <yasunaga@phys.kyutech.ac.jp>
Wed, 2 Mar 2022 04:24:18 +0000 (13:24 +0900)
committerTakuo Yasunaga <yasunaga@phys.kyutech.ac.jp>
Wed, 2 Mar 2022 04:24:18 +0000 (13:24 +0900)
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is behind 'origin/master' by 12 commits, and can be fast-forwarded.
   (use "git pull" to update your local branch)

 Changes to be committed:
modified:   src/Config/x86Mac64.inc
modified:   src/Objects/Makefile
modified:   src/Tools/filter/mrc2hdf/src/Makefile
modified:   src/Tools/filter/mrc2hdf/src/mrc2hdf.html
new file:   src/Tools/filter/mrc2hdf/src/test/Makefile
new file:   src/Tools/filter/mrc2hdf/src/test/data
modified:   util/src/DataFormat/Makefile

src/Config/x86Mac64.inc patch | blob | history
src/Objects/Makefile [changed mode: 0644->0755] patch | blob | history
src/Tools/filter/mrc2hdf/src/Makefile patch | blob | history
src/Tools/filter/mrc2hdf/src/mrc2hdf.html patch | blob | history
src/Tools/filter/mrc2hdf/src/test/Makefile [new file with mode: 0644] patch | blob
src/Tools/filter/mrc2hdf/src/test/data [new symlink] patch | blob
util/src/DataFormat/Makefile patch | blob | history

diff --git a/src/Config/x86Mac64.inc b/src/Config/x86Mac64.inc
index cb22324..4e0c205 100755 (executable)
--- a/src/Config/x86Mac64.inc
+++ b/src/Config/x86Mac64.inc
@@ -29,10 +29,8 @@ SHAREDCXX    = g++ -fpic
 #CCOPTSDEBUG = -O2 -pipe -march=nocona -g $(EXTRA_DEFINE) $(ARCHTYPE) \
 #      -I$(EOS_HOME)/util/$(OSTYPE)/include
 
-CCOPTS = -O2 -pipe $(EXTRA_DEFINE) $(ARCHTYPE) \
-       -I$(EOS_HOME)/util/$(OSTYPE)/include
-CCOPTSDEBUG = -pipe -g $(EXTRA_DEFINE) $(ARCHTYPE) \
-       -I$(EOS_HOME)/util/$(OSTYPE)/include
+CCOPTS = -O2 -pipe $(EXTRA_DEFINE) $(ARCHTYPE) -I$(EOS_HOME)/util/$(OSTYPE)/include
+CCOPTSDEBUG = -pipe -g $(EXTRA_DEFINE) $(ARCHTYPE) -I$(EOS_HOME)/util/$(OSTYPE)/include
 
 
 AR     = /usr/bin/ar
diff --git a/src/Objects/Makefile b/src/Objects/Makefile
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/src/Tools/filter/mrc2hdf/src/Makefile b/src/Tools/filter/mrc2hdf/src/Makefile
index a360703..ed717ba 100755 (executable)
--- a/src/Tools/filter/mrc2hdf/src/Makefile
+++ b/src/Tools/filter/mrc2hdf/src/Makefile
@@ -362,8 +362,8 @@ depend::
        @if [ -f $(OBJECTNAME).c ] ; \
        then \
                echo "dependency: *.c"; \
-               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c   ; \
-                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c                  >> $(OSTYPE)/.Depend ; \
+               echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.c   ; \
+                    $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.c                  >> $(OSTYPE)/.Depend ; \
        fi
        #echo CC
        @if [ -f $(OBJECTNAME).cc ] ; \
diff --git a/src/Tools/filter/mrc2hdf/src/mrc2hdf.html b/src/Tools/filter/mrc2hdf/src/mrc2hdf.html
index 1257a1b..ae476bf 100644 (file)
--- a/src/Tools/filter/mrc2hdf/src/mrc2hdf.html
+++ b/src/Tools/filter/mrc2hdf/src/mrc2hdf.html
@@ -1 +1,18 @@
-/bin/bash: mrc2hdf: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrc2hdf</TITLE>
+</HEAD>
+<BODY>
+<H1>mrc2hdf</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrc2hdf
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
diff --git a/src/Tools/filter/mrc2hdf/src/test/Makefile b/src/Tools/filter/mrc2hdf/src/test/Makefile
new file mode 100644 (file)
index 0000000..323c2db
--- /dev/null
+++ b/src/Tools/filter/mrc2hdf/src/test/Makefile
@@ -0,0 +1,17 @@
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+include ../../../../../Config/Define.inc
+
+all: help exec
+
+help:
+       @echo "----- Help Message Check -----"
+       @../$(OSTYPE)/$(OBJECTNAME)      -h
+
+exec:
+       @echo "----- Execution Check -----"
+       ../$(OSTYPE)/$(OBJECTNAME) 
+       @echo "----- Calc check -----"          
+
+clean:
diff --git a/src/Tools/filter/mrc2hdf/src/test/data b/src/Tools/filter/mrc2hdf/src/test/data
new file mode 120000 (symlink)
index 0000000..c98d87e
--- /dev/null
+++ b/src/Tools/filter/mrc2hdf/src/test/data
@@ -0,0 +1 @@
+../../../../../..//data/mrc2hdf
\ No newline at end of file
diff --git a/util/src/DataFormat/Makefile b/util/src/DataFormat/Makefile
index c5e9303..6ad998b 100644 (file)
--- a/util/src/DataFormat/Makefile
+++ b/util/src/DataFormat/Makefile
@@ -5,6 +5,14 @@ TARGET=hdf5
 HDF5-VERSION=1.12.0
 HDF5-VERSION2=1-12-0
 
+help::
+       @echo "HDF5:"
+       @echo " $ make init-hdf5"
+       @echo " $ make config-hdf5"
+       @echo " $ make all-hdf5"
+       @echo " $ make clean-hdf5"
+       @echo " $ make cleanAll-hdf5"
+
 init:: init-hdf5
 config:: config-hdf5
 clean:: clean-hdf5
This repository is a base of Eos.
About OSDN
Find Software
Develop Software
Help