Skip to content

Commit 18e9ade

Browse files
remove the trash that is nsis and use inno
1 parent 5a035c3 commit 18e9ade

File tree

4 files changed

+79
-390
lines changed

4 files changed

+79
-390
lines changed

makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ CP = copy /y
1717
EXMPL_DIR = $(call NATIVEPATH,$(INSTALLLOC)/CEdev/examples)
1818
CP_EXMPLS = $(call MKDIR,$(EXMPL_DIR)) && xcopy /y /s /e $(call NATIVEPATH,$(CURDIR)/examples) $(EXMPL_DIR)
1919
CPDIR = xcopy /y /s /e
20-
ARCH = makensis.exe /DDIST_PATH=$(call NATIVEPATH,$(DESTDIR)$(PREFIX)/CEdev) $(call NATIVEPATH,$(CURDIR)\tools\installer\installer.nsi) && \
21-
$(call MKDIR,release) && move /y tools\installer\CEdev.exe release\\
20+
ARCH = $(call MKDIR,release) && cd tools\installer && iscc.exe /DDIST_PATH=$(call NATIVEPATH,$(DESTDIR)$(PREFIX)/CEdev) installer.iss && \
21+
cd ..\.. && move /y tools\installer\CEdev.exe release\\
2222
else
2323
NATIVEPATH = $(subst \,/,$(1))
2424
RM = rm -f
@@ -182,7 +182,7 @@ uninstall:
182182
#----------------------------
183183
# install rule
184184
#----------------------------
185-
install: $(DIRS) chmod
185+
install: $(DIRS) chmod all
186186
$(CP_EXMPLS)
187187
$(CP) $(call NATIVEPATH,$(SRCDIR)/startup/*.src) $(call NATIVEPATH,$(INSTALLLIB))
188188
$(CP) $(call NATIVEPATH,$(SRCDIR)/makefile.mk) $(call NATIVEPATH,$(INSTALLINC)/.makefile)
@@ -271,3 +271,4 @@ help:
271271
#----------------------------
272272

273273
.PHONY: clean-libload libload release-libs clibraries doxygen chmod all clean graphx clean-graphx fileioc clean-fileioc keypadc clean-keypadc install uninstall help release fasmg
274+

tools/installer/EnvVarUpdate.nsh

Lines changed: 0 additions & 313 deletions
This file was deleted.

0 commit comments

Comments
 (0)