Skip to content

Commit

Permalink
Use new tools for unix2dos conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
amadvance committed Nov 14, 2017
1 parent ca5e501 commit 61f96a5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion advance/cab.mak
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,6 @@ ifeq ($(CONF_SYSTEM),dos)
cp -r $(CAB_CONTRIB_SRC) $(CAB_DIST_DIR_BIN)/contrib
endif
rm -f $(CAB_DIST_FILE_BIN).zip
find $(CAB_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec utod {} \;
find $(CAB_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec unix2dos {} \;
cd $(CAB_DIST_DIR_BIN) && zip -r ../$(CAB_DIST_FILE_BIN).zip *
rm -r $(CAB_DIST_DIR_BIN)
10 changes: 5 additions & 5 deletions advance/emu.mak
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ endif
cp -R $(srcdir)/src $(EMU_DIST_DIR_SRC)
cp -R $(srcdir)/srcmess $(EMU_DIST_DIR_SRC)
cp -R $(srcdir)/mess $(EMU_DIST_DIR_SRC)
find $(EMU_DIST_DIR_SRC) \( -name "*.dat" \) -type f -exec dtou {} \;
find $(EMU_DIST_DIR_SRC) \( -name "*.dat" \) -type f -exec dos2unix {} \;
rm -f $(EMU_DIST_FILE_SRC).tar.gz
tar cfzo $(EMU_DIST_FILE_SRC).tar.gz $(EMU_DIST_DIR_SRC)
rm -r $(EMU_DIST_DIR_SRC)
Expand Down Expand Up @@ -1171,13 +1171,13 @@ endif
mkdir $(EMU_DIST_DIR_BIN)/contrib
cp -R $(EMU_CONTRIB_SRC) $(EMU_DIST_DIR_BIN)/contrib
ifeq ($(CONF_SYSTEM),unix)
find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec dtou {} \;
find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec dos2unix {} \;
rm -f $(EMU_DIST_FILE_BIN).tar.gz
tar cfzo $(EMU_DIST_FILE_BIN).tar.gz $(EMU_DIST_DIR_BIN)
else
find $(EMU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec utod {} \;
find $(EMU_DIST_DIR_BIN) \( -name "*.bat" \) -type f -exec utod {} \;
find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec utod {} \;
find $(EMU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec unix2dos {} \;
find $(EMU_DIST_DIR_BIN) \( -name "*.bat" \) -type f -exec unix2dos {} \;
find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec unix2dos {} \;
rm -f $(EMU_DIST_FILE_BIN).zip
cd $(EMU_DIST_DIR_BIN) && zip -r ../$(EMU_DIST_FILE_BIN).zip *
endif
Expand Down
2 changes: 1 addition & 1 deletion advance/menu.mak
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ ifeq ($(CONF_SYSTEM),unix)
tar cfzo $(MENU_DIST_FILE_BIN).tar.gz $(MENU_DIST_DIR_BIN)
else
rm -f $(MENU_DIST_FILE_BIN).zip
find $(MENU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec utod {} \;
find $(MENU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec unix2dos {} \;
cd $(MENU_DIST_DIR_BIN) && zip -r ../$(MENU_DIST_FILE_BIN).zip *
endif
rm -r $(MENU_DIST_DIR_BIN)
Expand Down

0 comments on commit 61f96a5

Please sign in to comment.