spec: move manual into spec dir

dyzhan · Nov 1, 2017 · a1d9b3a · a1d9b3a
1 parent ae2196a
commit a1d9b3a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/manual/Makefile → spec/manual/Makefile b/manual/Makefile → spec/manual/Makefile
@@ -1,9 +1,7 @@
-DEPTH := ..
+DEPTH := ../..
 include $(DEPTH)/tools/make/common.make
 
 # the output dir
-REL_PATH_FROM_TOT := $(shell $(DEPTH)/tools/bin/depth -from_tot)
-TOT := $(shell $(DEPTH)/tools/bin/depth -abs_tot)
 OUT_DIR = $(TOT)/$(OUTDIR)/$(PROJECT)/$(REL_PATH_FROM_TOT)
 
 #====================================
@@ -13,19 +11,19 @@ REG_PARMS = test.parms
 REG_RDL = test.rdl
 
 # several backends 
-REG_V = regs_v.v
-REG_S = sv/
-REG_U = regs_ral.sv
-REG_C = cmod
-REG_D = dmod
+REG_V = $(OUT_DIR)/regs_v.v
+REG_S = $(OUT_DIR)/sv/
+REG_U = $(OUT_DIR)/regs_ral.sv
+REG_C = $(OUT_DIR)/cmod
+REG_D = $(OUT_DIR)/dmod
 default:
-	$(AT)$(JAVA) -jar Ordt.jar -parms $(REG_PARMS) -systemverilog $(REG_S) -verilog $(REG_V) -uvmregs $(REG_U) -cppmod $(REG_C) -cppdrvmod $(REG_D) $(REG_RDL)
 	@mkdir -p $(OUT_DIR)
-	@cp -f $(REG_V) $(OUT_DIR)/; rm $(REG_V) -rf
-	@cp -f $(REG_U) $(OUT_DIR)/; rm $(REG_U) -rf
-	@cp -rf $(REG_S) $(OUT_DIR)/; rm $(REG_S) -rf
-	@cp -rf $(REG_C) $(OUT_DIR)/; rm $(REG_C) -rf
-	@cp -rf $(REG_D) $(OUT_DIR)/; rm $(REG_D) -rf
+	$(AT)$(JAVA) -jar Ordt.jar -parms $(REG_PARMS) -systemverilog $(REG_S) -verilog $(REG_V) -uvmregs $(REG_U) -cppmod $(REG_C) -cppdrvmod $(REG_D) $(REG_RDL)
+	#@cp -f $(REG_V) $(OUT_DIR)/; rm $(REG_V) -rf
+	#@cp -f $(REG_U) $(OUT_DIR)/; rm $(REG_U) -rf
+	#@cp -rf $(REG_S) $(OUT_DIR)/; rm $(REG_S) -rf
+	#@cp -rf $(REG_C) $(OUT_DIR)/; rm $(REG_C) -rf
+	#@cp -rf $(REG_D) $(OUT_DIR)/; rm $(REG_D) -rf
 	@echo "=============================================="
 	@echo "files are generated under $(OUT_DIR)"
 	@echo "=============================================="

diff --git a/manual/Ordt.jar → spec/manual/Ordt.jar b/manual/Ordt.jar → spec/manual/Ordt.jar
diff --git a/manual/README.md → spec/manual/README.md b/manual/README.md → spec/manual/README.md
diff --git a/manual/test.parms → spec/manual/test.parms b/manual/test.parms → spec/manual/test.parms
diff --git a/manual/test.rdl → spec/manual/test.rdl b/manual/test.rdl → spec/manual/test.rdl
diff --git a/tools/bin/tmake b/tools/bin/tmake
@@ -52,9 +52,10 @@ build();
 ## SUB
 #=============================
 sub build {
-    my $log_tmp = $log.".tmp";
+    my $outdir_log_tmp = "$outdir/$log".".tmp";
 
-    system ("rm -rf $outdir_log");
+    #system ("rm -rf $outdir_log");
+    unlink $outdir_log;
     system ("mkdir -p $outdir");
     system ("touch  $outdir_log");
 
@@ -68,8 +69,8 @@ sub build {
             croak "[ERROR]: build target $only does not exist in $cfg" unless $tree->{$only};
 
             foreach my $sandbox (@{$tree->{$only}{sandbox}}) {
-                system("$MAKE -C $sandbox PROJECT=$project $opt_m | tee $log_tmp")==0 or die "$sandbox build fail: $?" if $run;
-                system ("cat $log_tmp >> $outdir_log") if $run;
+                system("$MAKE -C $sandbox PROJECT=$project $opt_m | tee $outdir_log_tmp")==0 or die "$sandbox build fail: $?" if $run;
+                system ("cat $outdir_log_tmp >> $outdir_log") if $run;
             }
 
         } else {
@@ -96,16 +97,17 @@ sub build {
                 print "leaf=$leaf\n" if $debug;
 
                 foreach my $sandbox (@{$tree->{$leaf}{sandbox}}) {
-                    system("$MAKE -C $sandbox PROJECT=$project $opt_m | tee $log_tmp")==0 or die "$sandbox build fail: $?" if $run;
-                    system ("cat $log_tmp >> $outdir_log") if $run;
+                    system("$MAKE -C $sandbox PROJECT=$project $opt_m | tee $outdir_log_tmp")==0 or die "$sandbox build fail: $?" if $run;
+                    system ("cat $outdir_log_tmp >> $outdir_log") if $run;
                 }
 
                 $done->{$leaf} = 1;
                 delete $tree->{$leaf};
             }
         }
     }
-    system ("rm -rf $log_tmp");
+    #system ("rm -rf $outdir_log_tmp");
+    unlink $outdir_log_tmp;
 
     print "logfile: $outdir_log\n";
     my $tee = IO::Tee->new(\*STDOUT, $outdir_log);

diff --git a/tools/etc/build.config b/tools/etc/build.config
@@ -1,11 +1,11 @@
 ---
 defs:
   sandbox:
-    - defs
+    - spec/defs
 
 manual:
   sandbox:
-    - manual
+    - spec/manual
 
 vmod_vlibs:
   sandbox: