Attachment #200018 for bug #242178

Lines 2354-2360 Link Here

(-)scilab-4.1.2/configure.in (-1 / +1 lines)
2354	AC_SUBST(JAVASCITARGET_DISTCLEAN)	2354	AC_SUBST(JAVASCITARGET_DISTCLEAN)
2355	AC_SUBST(JAVA_INCL)	2355	AC_SUBST(JAVA_INCL)
2356	AC_SUBST(GCCFIX)	2356	AC_SUBST(GCCFIX)
2357	AC_OUTPUT(Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/os_specific/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex config/Makeso.incl routines/interf/Makefile routines/control/Makefile routines/system/Makefile routines/calelm/Makefile config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile routines/version.h imp/Makefile routines/gtksci/Makefile pvm3/Makefile pvm3/Makefile.aimk pvm3/hoster/Makefile.aimk config/configuration macros/util/gettklib.sci macros/util/xmlfiletohtml.sci routines/gzvt2/Makefile routines/Javasci/Makefile $MAN_FR $MAN_ENG)	2357	AC_OUTPUT(Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/os_specific/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex config/Makeso.incl routines/interf/Makefile routines/control/Makefile routines/system/Makefile routines/calelm/Makefile config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile routines/version.h imp/Makefile routines/gtksci/Makefile pvm3/Makefile pvm3/Makefile.aimk config/configuration macros/util/gettklib.sci macros/util/xmlfiletohtml.sci routines/gzvt2/Makefile routines/Javasci/Makefile $MAN_FR $MAN_ENG)
2358		2358
2359		2359
2360		2360




PVM_CCOMPILER=VISUALC++


all	:: message libs pvmtracer pvmconsole gslib 

message	:: 
	@echo ====================================

	@nmake /C /f makefile.mak
	@cd $(PVM_ROOT)

#pvmhoster:
#	@echo making all in hoster
#	@cd $(PVM_ROOT)\hoster
#	@SET PVM_ROOT=$(PVM_ROOT)
#	@SET PVM_ARCH=$(PVM_ARCH)
#	@SET PVM_CCOMPILER=$(PVM_CCOMPILER)
#	@SET PVM_CINCLUDE=.
#	@nmake /C /f makefile.mak
#	@cd $(PVM_ROOT)

gslib	: 
	@echo making all in pvmgs

Lines 139-146 Link Here

(-)scilab-4.1.2/pvm3/Makefile.aimk.in (-4 / +4 lines)
139	@ echo "done building srm"	139	@ echo "done building srm"
140		140
141	## build hoster ##	141	## build hoster ##
142	h:	142	#h:
143	@ echo "building hoster"	143	# @ echo "building hoster"
144	- cd hoster; ../lib/aimk $(PVMOPTS) install	144	# - cd hoster; ../lib/aimk $(PVMOPTS) install
145	@ echo "done building hoster"	145	# @ echo "done building hoster"
146		146





include ../Makefile.incl.mak

all	:: message libs pvmtracer pvmconsole gslib 

message	:: 
	@echo ====================================

	@nmake /C /f makefile.mak
	@cd $(PVM_ROOT)

#pvmhoster:
#	@echo making all in hoster
#	@cd $(PVM_ROOT)\hoster
#	@SET PVM_ROOT=$(PVM_ROOT)
#	@SET PVM_ARCH=$(PVM_ARCH)
#	@SET PVM_CCOMPILER=$(PVM_CCOMPILER)
#	@SET PVM_CINCLUDE=.
#	@nmake /C /f makefile.mak
#	@cd $(PVM_ROOT)

gslib	: 
	@echo making all in pvmgs




#
# $Id: Makefile.aimk.in,v 1.2 2002/10/31 13:14:04 chanceli Exp $
#
# Generic Makefile body to be concatenated to config header.
#
# Imports:
#  PVM_ARCH   = the official pvm-name of your processor
#  ARCHCFLAGS = special cc flags
#  ARCHLIB    = special libs needed for daemon
#
SHELL		=	/bin/sh
PVMDIR		=	../..
PVMIDIR		=	$(PVMDIR)/include
PVMSDIR		=	$(PVMDIR)/src
PVMLDIR		=	$(PVMDIR)/lib/$(PVM_ARCH)
PVMLIB		=	pvm3
LIBPREFIX	=	lib
PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
SDIR		=	$(PVMDIR)/hoster
BDIR		=	$(PVMDIR)/bin
XDIR		=	$(BDIR)/$(PVM_ARCH)

CFLOPTS		=	-O
CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
				$(ARCHCFLAGS)
LIBS		=	-L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)

HEADERS		=	$(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h

REXECOBJ	= @PVMHOSTERFILES@

default:	all
install:	all

all:	$(XDIR)/hoster$(EXESFX)

$(XDIR):
	- mkdir $(BDIR)
	- mkdir $(XDIR)

$(XDIR)/hoster$(EXESFX):  $(XDIR) hoster$(EXESFX)
	cp hoster$(EXESFX) $(XDIR)

hoster$(EXESFX):  $(SDIR)/hoster.c $(HEADERS) $(PVMLIBDEP) $(REXECOBJ)
	$(CC) $(CFLAGS) -o $@ $(SDIR)/hoster.c $(REXECOBJ) $(LIBS)

rexec.o:  $(PVMDIR)/src/$(PVM_ARCH)/src/rexec.c 
	$(CC) $(CFLAGS) -c $(PVMDIR)/src/$(PVM_ARCH)/src/rexec.c 
ruserpas.o:  $(PVMDIR)/src/$(PVM_ARCH)/src/ruserpas.c 
	$(CC) $(CFLAGS) -c $(PVMDIR)/src/$(PVM_ARCH)/src/ruserpas.c 

clean:
	rm -f *.o hoster$(EXESFX)





#
# $Id: Makefile.mak,v 1.1 2002/10/28 13:56:34 chanceli Exp $
#

#*************************************************************#
#**                                                         **#
#**      Nmake file for the PVM hoster                      **#
#**                   hoster.exe                            **#
#**                                                         **#
#**                                                         **#
#*************************************************************#


!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE 
NULL=nul
!ENDIF 

!include $(PVM_ROOT)\conf\$(PVM_ARCH).def

SDIR	=	$(PVM_ROOT)\src
HDIR	=	$(PVM_ROOT)\hoster

OBJS	=	$(PVM_ARCH)\hoster.obj $(PVM_ARCH)\pvmwinrexec.obj \
			$(PVM_ARCH)\pvmwinrsh.obj

all:	paths hoster

#

paths:
	@if not exist "$(PVM_ROOT)\bin\$(PVM_ARCH)\$(NULL)" mkdir "$(PVM_ROOT)\bin\$(PVM_ARCH)"
	@if not exist "$(PVM_ARCH)\$(NULL)" mkdir "$(PVM_ARCH)"

hoster: $(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe 

$(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe :   $(OBJS)
	@echo Creation of $*.exe
	@$(linkexe) $(conflags) \
		$(OUTBIN)$(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe \
		$(OBJS) $(PVM_ROOT)\lib\$(PVM_ARCH)\libpvm3.lib \
		$(link_multithread) /nodefaultlib:libc.lib

$(PVM_ARCH)\hoster.obj:  $(HDIR)\hoster.c
	$(cc) $(cdebug) $(cflags) $(cvars) \
		$(OUT)$(PVM_ARCH)\hoster.obj $(HDIR)\hoster.c

$(PVM_ARCH)\pvmwinrexec.obj:  $(HDIR)\pvmwinrexec.c
	$(cc) $(cdebug) $(cflags) $(cvars) \
		$(OUT)$(PVM_ARCH)\pvmwinrexec.obj \
		$(HDIR)\pvmwinrexec.c

$(PVM_ARCH)\pvmwinrsh.obj:  $(HDIR)\pvmwinrsh.c
	$(cc) $(cdebug) $(cflags) $(cvars) \
		$(OUT)$(PVM_ARCH)\pvmwinrsh.obj \
		$(HDIR)\pvmwinrsh.c

# Clean up everything but the .EXEs

clean :
	-del *.obj
	-del *.pdb


Return to bug 242178

Lines 6-12 Link Here

(-)scilab-4.1.2/pvm3/Make-PVM3.mak (-10 / +10 lines)
6	PVM_CCOMPILER=VISUALC++	6	PVM_CCOMPILER=VISUALC++
7		7
8		8
9	all :: message libs pvmtracer pvmconsole gslib pvmhoster	9	all :: message libs pvmtracer pvmconsole gslib
10		10
11	message ::	11	message ::
12	@echo ====================================	12	@echo ====================================
Lines 44-58 Link Here
44	@nmake /C /f makefile.mak	44	@nmake /C /f makefile.mak
45	@cd $(PVM_ROOT)	45	@cd $(PVM_ROOT)
46		46
47	pvmhoster:	47	#pvmhoster:
48	@echo making all in hoster	48	# @echo making all in hoster
49	@cd $(PVM_ROOT)\hoster	49	# @cd $(PVM_ROOT)\hoster
50	@SET PVM_ROOT=$(PVM_ROOT)	50	# @SET PVM_ROOT=$(PVM_ROOT)
51	@SET PVM_ARCH=$(PVM_ARCH)	51	# @SET PVM_ARCH=$(PVM_ARCH)
52	@SET PVM_CCOMPILER=$(PVM_CCOMPILER)	52	# @SET PVM_CCOMPILER=$(PVM_CCOMPILER)
53	@SET PVM_CINCLUDE=.	53	# @SET PVM_CINCLUDE=.
54	@nmake /C /f makefile.mak	54	# @nmake /C /f makefile.mak
55	@cd $(PVM_ROOT)	55	# @cd $(PVM_ROOT)
56		56
57	gslib :	57	gslib :
58	@echo making all in pvmgs	58	@echo making all in pvmgs

Lines 3-9 Link Here

(-)scilab-4.1.2/pvm3/Makefile.mak (-10 / +10 lines)
3		3
4	include ../Makefile.incl.mak	4	include ../Makefile.incl.mak
5		5
6	all :: message libs pvmtracer pvmconsole gslib pvmhoster	6	all :: message libs pvmtracer pvmconsole gslib
7		7
8	message ::	8	message ::
9	@echo ====================================	9	@echo ====================================
Lines 41-55 Link Here
41	@nmake /C /f makefile.mak	41	@nmake /C /f makefile.mak
42	@cd $(PVM_ROOT)	42	@cd $(PVM_ROOT)
43		43
44	pvmhoster:	44	#pvmhoster:
45	@echo making all in hoster	45	# @echo making all in hoster
46	@cd $(PVM_ROOT)\hoster	46	# @cd $(PVM_ROOT)\hoster
47	@SET PVM_ROOT=$(PVM_ROOT)	47	# @SET PVM_ROOT=$(PVM_ROOT)
48	@SET PVM_ARCH=$(PVM_ARCH)	48	# @SET PVM_ARCH=$(PVM_ARCH)
49	@SET PVM_CCOMPILER=$(PVM_CCOMPILER)	49	# @SET PVM_CCOMPILER=$(PVM_CCOMPILER)
50	@SET PVM_CINCLUDE=.	50	# @SET PVM_CINCLUDE=.
51	@nmake /C /f makefile.mak	51	# @nmake /C /f makefile.mak
52	@cd $(PVM_ROOT)	52	# @cd $(PVM_ROOT)
53		53
54	gslib :	54	gslib :
55	@echo making all in pvmgs	55	@echo making all in pvmgs

Lines 1-54 Link Here

(-)scilab-4.1.2/pvm3/hoster/Makefile.aimk.in (-54 lines)
1	#
2	# $Id: Makefile.aimk.in,v 1.2 2002/10/31 13:14:04 chanceli Exp $
3	#
4	# Generic Makefile body to be concatenated to config header.
5	#
6	# Imports:
7	# PVM_ARCH = the official pvm-name of your processor
8	# ARCHCFLAGS = special cc flags
9	# ARCHLIB = special libs needed for daemon
10	#
11	SHELL = /bin/sh
12	PVMDIR = ../..
13	PVMIDIR = $(PVMDIR)/include
14	PVMSDIR = $(PVMDIR)/src
15	PVMLDIR = $(PVMDIR)/lib/$(PVM_ARCH)
16	PVMLIB = pvm3
17	LIBPREFIX = lib
18	PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
19	SDIR = $(PVMDIR)/hoster
20	BDIR = $(PVMDIR)/bin
21	XDIR = $(BDIR)/$(PVM_ARCH)
22
23	CFLOPTS = -O
24	CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
25	$(ARCHCFLAGS)
26	LIBS = -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
27
28	HEADERS = $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h
29
30	REXECOBJ = @PVMHOSTERFILES@
31
32	default: all
33	install: all
34
35	all: $(XDIR)/hoster$(EXESFX)
36
37	$(XDIR):
38	- mkdir $(BDIR)
39	- mkdir $(XDIR)
40
41	$(XDIR)/hoster$(EXESFX): $(XDIR) hoster$(EXESFX)
42	cp hoster$(EXESFX) $(XDIR)
43
44	hoster$(EXESFX): $(SDIR)/hoster.c $(HEADERS) $(PVMLIBDEP) $(REXECOBJ)
45	$(CC) $(CFLAGS) -o $@ $(SDIR)/hoster.c $(REXECOBJ) $(LIBS)
46
47	rexec.o: $(PVMDIR)/src/$(PVM_ARCH)/src/rexec.c
48	$(CC) $(CFLAGS) -c $(PVMDIR)/src/$(PVM_ARCH)/src/rexec.c
49	ruserpas.o: $(PVMDIR)/src/$(PVM_ARCH)/src/ruserpas.c
50	$(CC) $(CFLAGS) -c $(PVMDIR)/src/$(PVM_ARCH)/src/ruserpas.c
51
52	clean:
53	rm -f *.o hoster$(EXESFX)
54

Lines 1-64 Link Here

(-)scilab-4.1.2/pvm3/hoster/Makefile.mak (-64 lines)
1	#
2	# $Id: Makefile.mak,v 1.1 2002/10/28 13:56:34 chanceli Exp $
3	#
4
5	#*************************************************************#
6	# #
7	# Nmake file for the PVM hoster #
8	# hoster.exe #
9	# #
10	# #
11	#*************************************************************#
12
13
14	!IF "$(OS)" == "Windows_NT"
15	NULL=
16	!ELSE
17	NULL=nul
18	!ENDIF
19
20	!include $(PVM_ROOT)\conf\$(PVM_ARCH).def
21
22	SDIR = $(PVM_ROOT)\src
23	HDIR = $(PVM_ROOT)\hoster
24
25	OBJS = $(PVM_ARCH)\hoster.obj $(PVM_ARCH)\pvmwinrexec.obj \
26	$(PVM_ARCH)\pvmwinrsh.obj
27
28	all: paths hoster
29
30	#
31
32	paths:
33	@if not exist "$(PVM_ROOT)\bin\$(PVM_ARCH)\$(NULL)" mkdir "$(PVM_ROOT)\bin\$(PVM_ARCH)"
34	@if not exist "$(PVM_ARCH)\$(NULL)" mkdir "$(PVM_ARCH)"
35
36	hoster: $(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe
37
38	$(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe : $(OBJS)
39	@echo Creation of $*.exe
40	@$(linkexe) $(conflags) \
41	$(OUTBIN)$(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe \
42	$(OBJS) $(PVM_ROOT)\lib\$(PVM_ARCH)\libpvm3.lib \
43	$(link_multithread) /nodefaultlib:libc.lib
44
45	$(PVM_ARCH)\hoster.obj: $(HDIR)\hoster.c
46	$(cc) $(cdebug) $(cflags) $(cvars) \
47	$(OUT)$(PVM_ARCH)\hoster.obj $(HDIR)\hoster.c
48
49	$(PVM_ARCH)\pvmwinrexec.obj: $(HDIR)\pvmwinrexec.c
50	$(cc) $(cdebug) $(cflags) $(cvars) \
51	$(OUT)$(PVM_ARCH)\pvmwinrexec.obj \
52	$(HDIR)\pvmwinrexec.c
53
54	$(PVM_ARCH)\pvmwinrsh.obj: $(HDIR)\pvmwinrsh.c
55	$(cc) $(cdebug) $(cflags) $(cvars) \
56	$(OUT)$(PVM_ARCH)\pvmwinrsh.obj \
57	$(HDIR)\pvmwinrsh.c
58
59	# Clean up everything but the .EXEs
60
61	clean :
62	-del *.obj
63	-del *.pdb
64