Changeset 49 for trunk/oarutils

Timestamp:

Dec 13, 2011, 9:23:31 AM (12 years ago)

Author:

g7moreau

Message:

• General makefile width install and update
• Cut long line

Location:

trunk/oarutils

Files:

• Makefile (modified) (2 diffs)
• oar-parexec (modified) (5 diffs)

trunk/oarutils/Makefile

@@ -1 +1 @@
 
-CC=mpiCC
-CCFLAGS=-O2
-PODFLAG=-c 'User Contributed OAR Documentation' -r 'LEGI Trokata'
+# General configuration
 
-DESTDIR:=/opt/oar/current
+CC         := mpiCC
+CCFLAGS    := -O2
+PODFLAG    := -c 'User Contributed OAR Documentation' -r 'LEGI Trokata'
 
+TARGET_C   := mpilauncher
+TARGET_MAN := mpilauncher.1 oar-envsh.1 oar-dispatch.1 oar-parexec.1
+
+PREFIX     :=/opt/oar/current
+PREFIX_MAN  =$(PREFIX)/man
+
+
+# User specific configuration
+
+sinclude config.mk
+
+
+# Target and rules
 
 .PHONY: all clean distclean install update sync
 
-all: mpilauncher mpilauncher.1 oar-envsh.1 oar-dispatch.1 oar-parexec.1
+all: $(TARGET_C) $(TARGET_MAN)
 
 clean:
@@ -20 +33 @@
 
 update:
-        @install -d -m 0755 -o root -g root $(DESTDIR)/bin
-        @install -d -m 0755 -o root -g root $(DESTDIR)/man/man1
-        install -m 0755 -o root -g root oar-parexec $(DESTDIR)/bin
-        install -m 0755 -o root -g root oar-dispatch $(DESTDIR)/bin
-        install -m 0755 -o root -g root mpilauncher $(DESTDIR)/bin
-        install -m 0644 -o root -g root oar-parexec.1 $(DESTDIR)/man/man1
-        install -m 0644 -o root -g root oar-dispatch.1 $(DESTDIR)/man/man1
-        install -m 0644 -o root -g root mpilauncher.1 $(DESTDIR)/man/man1
-        install -m 0644 -o root -g root oar-envsh.1 $(DESTDIR)/man/man1
+        @install -d -m 0755 -o root -g root $(PREFIX)/bin
+        @install -d -m 0755 -o root -g root $(PREFIX_MAN)/man1
+        install -m 0755 -o root -g root oar-parexec $(PREFIX)/bin
+        install -m 0755 -o root -g root oar-dispatch $(PREFIX)/bin
+        install -m 0755 -o root -g root mpilauncher $(PREFIX)/bin
+        install -m 0644 -o root -g root oar-parexec.1 $(PREFIX_MAN)/man1
+        install -m 0644 -o root -g root oar-dispatch.1 $(PREFIX_MAN)/man1
+        install -m 0644 -o root -g root mpilauncher.1 $(PREFIX_MAN)/man1
+        install -m 0644 -o root -g root oar-envsh.1 $(PREFIX_MAN)/man1
 
 sync:

trunk/oarutils/oar-parexec

@@ -415 +415 @@
 These jobs could be launch by:
 
- oarsub -n test -l /core=6,walltime=04:00:00 "oar-parexec -f ./subjob.list.txt"
+ oarsub -n test -l /core=6,walltime=04:00:00 \
+   "oar-parexec -f ./subjob.list.txt"
 
 =head2 Folder job
@@ -425 +426 @@
 A very simple job could be:
 
- oarsub -n test -l /core=6,walltime=04:00:00 "oar-parexec -d ./subjob.d -c 'sleep 10; env'"
+ oarsub -n test -l /core=6,walltime=04:00:00 \
+   "oar-parexec -d ./subjob.d -c 'sleep 10; env'"
 
 The command C<env> will be excuted in all folder F<test1>, F<test2>... after a 10s pause.
@@ -442 +444 @@
 Example with parallel small job on 2 core:
 
- oarsub -n test -l /core=6,walltime=04:00:00 "oar-parexec -j 2 -f ./subjob.list.txt"
+ oarsub -n test -l /core=6,walltime=04:00:00 \
+   "oar-parexec -j 2 -f ./subjob.list.txt"
 
 =head2 Tracing and master crash
@@ -451 +454 @@
 and not re-run these job the second and next time.
 
- oarsub -n test -l /core=6,walltime=04:00:00 "oar-parexec -f ./subjob.list.txt -l ./subjob.list.log"
+ oarsub -n test -l /core=6,walltime=04:00:00 \
+   "oar-parexec -f ./subjob.list.txt -l ./subjob.list.log"
 
 After a crash or an C<oardel> command,
 you can then re-run the same command that will end to execute the jobs in the list
 
- oarsub -n test -l /core=6,walltime=04:00:00 "oar-parexec -f ./subjob.list.txt -l ./subjob.list.log"
+ oarsub -n test -l /core=6,walltime=04:00:00 \
+   "oar-parexec -f ./subjob.list.txt -l ./subjob.list.log"
 
 C<logtrace> file are just plain file.
@@ -473 +478 @@
 After being checkpointed, C<oar-parexec> do not start any new small job.
 
- oarsub -t idempotent -n test -l /core=6,walltime=04:00:00 --checkpoint 720 \
+ oarsub -t idempotent -n test \
+   -l /core=6,walltime=04:00:00 \
+   --checkpoint 720 \
    "oar-parexec -f ./subjob.list.txt -l ./subjob.list.log"